Update BUILD.CMD and CHANGELOG.TXT for 1.67 RC2.

BUILD.CMD

@@ -1,6 +1,6 @@
 @echo off
 
-SET VERSIONTAG=RC1
+SET VERSIONTAG=RC2
 
 SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 SET DEVENV="devenv.exe"

CREDITS.TXT

@@ -1,6 +1,7 @@
 Contributors
 ============
 
+Lionel Caignec
 Felix Deimel
 Tom Hiller
 Riley McArdle

mRemoteV1/App/App.Info.vb

@@ -36,7 +36,7 @@ Namespace App
             Public Shared ReadOnly DefaultConnectionsPath As String = App.Info.Settings.SettingsPath
             Public Shared ReadOnly DefaultConnectionsFile As String = "confCons.xml"
             Public Shared ReadOnly DefaultConnectionsFileNew As String = "confConsNew.xml"
-            Public Shared ReadOnly ConnectionFileVersion As Double = 2.2
+            Public Shared ReadOnly ConnectionFileVersion As Double = 2.3
         End Class
 
         Public Class Credentials

mRemoteV1/App/App.Runtime.vb

@@ -449,6 +449,8 @@ Namespace App
                 My.Settings.ConDefaultCacheBitmaps = .CacheBitmaps
                 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
@@ -509,6 +511,8 @@ Namespace App
                 My.Settings.InhDefaultCacheBitmaps = .CacheBitmaps
                 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
@@ -886,6 +890,8 @@ Namespace App
                                     Select Case pValue
                                         Case 8
                                             nConI.Colors = Connection.Protocol.RDP.RDPColors.Colors256
+                                        Case 15
+                                            nConI.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit
                                         Case 16
                                             nConI.Colors = Connection.Protocol.RDP.RDPColors.Colors16Bit
                                         Case 24
@@ -921,6 +927,18 @@ Namespace App
                                     Else
                                         nConI.DisplayThemes = False
                                     End If
+                                Case "allow font smoothing"
+                                    If pValue = 1 Then
+                                        nConI.EnableFontSmoothing = True
+                                    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

mRemoteV1/CHANGELOG.TXT

@@ -1,10 +1,24 @@
-1.67 (2011-XX-XX):
+1.67 (2011-05-25):
   Fixed migration of external tools configuration and panel layout from Local to Roaming folder.
   Disable ICA Hotkeys for Citrix connections.  Fixes issue with international users.
   Added a language selection option so users can override the language if they don't want it automatically detected.
+  Added partial French translation to the application.
+  Addded Thai translation to the installer.
+  Updated graphics in the installer to mRemoteNG logo.
   Fixed RD Gateway default properties and RDP reconnection count setting not being saved.
   Fixed bug 33 - IPv6 doesn't work in quick Connect box.
   Moved the items under Tools in the Connections panel context menu up to the top level.
+  Added buttons for Add Connection, Add Folder, and Sort Ascending (A-Z) to the Connections panel toolbar.
+  Fixed rename edit control staying open when collapsing all folders.
+  Changed sorting to sort all subfolders below the selected folder.
+  Allow sorting of connections if a connection entry is selected.
+  Fixed adding a connection entry if nothing is selected in the tree.
+  Added 15-bit Color RDP setting.
+  Fixed loading of RDP Colors setting from SQL.
+  Added Font Smoothing and Desktop Composition RDP settings.
+  Improved error handling when loading XML connection files.
+  Added the mRemoteNG icon to the list of selectable icons for connection entries.
+  Changed to use full four part version numbers with major, minor, build, and revision.
 
 1.66 (2011-05-02):
   Fixed connections not working

mRemoteV1/Config/Config.Connections.Load.vb

@@ -426,6 +426,8 @@ Namespace Config
                         conI.Domain = .Item("DomainName")
                         conI.DisplayWallpaper = .Item("DisplayWallpaper")
                         conI.DisplayThemes = .Item("DisplayThemes")
+                        conI.EnableFontSmoothing = .Item("EnableFontSmoothing")
+                        conI.EnableDesktopComposition = .Item("EnableDesktopComposition")
                         conI.CacheBitmaps = .Item("CacheBitmaps")
                         conI.UseConsoleSession = .Item("ConnectToConsole")
 
@@ -440,7 +442,7 @@ Namespace Config
                         conI.Port = .Item("Port")
                         conI.PuttySession = .Item("PuttySession")
 
-                        conI.Colors = .Item("Colors")
+                        conI.Colors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPColors), .Item("Colors"))
                         conI.Resolution = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPResolutions), .Item("Resolution"))
 
                         conI.Inherit = New Connection.Info.Inheritance(conI)
@@ -449,6 +451,8 @@ Namespace Config
                         conI.Inherit.Description = .Item("InheritDescription")
                         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")
@@ -781,9 +785,9 @@ Namespace Config
             End Sub
 
             Private Function GetConnectionInfoFromXml(ByVal xxNode As XmlNode) As Connection.Info
-                Try
-                    Dim conI As New Connection.Info
+                Dim conI As New Connection.Info
 
+                Try
                     With xxNode
                         If Me.confVersion > 0.1 Then '0.2
                             conI.Name = .Attributes("Name").Value
@@ -879,6 +883,8 @@ Namespace Config
                                     conI.Colors = Connection.Protocol.RDP.RDPColors.Colors24Bit
                                 Case 3
                                     conI.Colors = Connection.Protocol.RDP.RDPColors.Colors32Bit
+                                Case 4
+                                    conI.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit
                             End Select
 
                             conI.RedirectSound = .Attributes("RedirectSound").Value
@@ -998,13 +1004,21 @@ Namespace Config
                             conI.Inherit.RDGatewayPassword = .Attributes("InheritRDGatewayPassword").Value
                             conI.Inherit.RDGatewayDomain = .Attributes("InheritRDGatewayDomain").Value
                         End If
-                    End With
 
-                    Return conI
+                        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
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strGetConnectionInfoFromXmlFailed & vbNewLine & ex.Message, True)
-                    Return Nothing
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strGetConnectionInfoFromXmlFailed, conI.Name, Me.ConnectionFileName, ex.Message), False)
                 End Try
+                Return conI
             End Function
 
             Private Function Authenticate(ByVal Value As String, ByVal CompareToOriginalValue As Boolean, Optional ByVal RootInfo As mRemoteNG.Root.Info = Nothing) As Boolean

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, 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, InheritDomain, " & _
+                                               "InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritEnableFontSmoothing, InheritEnableDesktopComposition, InheritDomain, " & _
                                                "InheritIcon, InheritPanel, InheritPassword, InheritPort, " & _
                                                "InheritProtocol, InheritPuttySession, InheritRedirectDiskDrives, " & _
                                                "InheritRedirectKeys, InheritRedirectPorts, InheritRedirectPrinters, " & _
@@ -308,6 +308,8 @@ Namespace Config
                     sqlQuery.CommandText &= "'" & .Resolution.ToString & "',"
                     sqlQuery.CommandText &= "'" & .DisplayWallpaper & "',"
                     sqlQuery.CommandText &= "'" & .DisplayThemes & "',"
+                    sqlQuery.CommandText &= "'" & .EnableFontSmoothing & "',"
+                    sqlQuery.CommandText &= "'" & .EnableDesktopComposition & "',"
                     sqlQuery.CommandText &= "'" & .CacheBitmaps & "',"
                     sqlQuery.CommandText &= "'" & .RedirectDiskDrives & "',"
                     sqlQuery.CommandText &= "'" & .RedirectPorts & "',"
@@ -369,6 +371,8 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & .Description & "',"
                             sqlQuery.CommandText &= "'" & .DisplayThemes & "',"
                             sqlQuery.CommandText &= "'" & .DisplayWallpaper & "',"
+                            sqlQuery.CommandText &= "'" & .EnableFontSmoothing & "',"
+                            sqlQuery.CommandText &= "'" & .EnableDesktopComposition & "',"
                             sqlQuery.CommandText &= "'" & .Domain & "',"
                             sqlQuery.CommandText &= "'" & .Icon & "',"
                             sqlQuery.CommandText &= "'" & .Panel & "',"
@@ -634,6 +638,10 @@ Namespace Config
 
                     xW.WriteAttributeString("DisplayThemes", "", curConI.DisplayThemes)
 
+                    xW.WriteAttributeString("EnableFontSmoothing", "", curConI.EnableFontSmoothing)
+
+                    xW.WriteAttributeString("EnableDesktopComposition", "", curConI.EnableDesktopComposition)
+
                     xW.WriteAttributeString("CacheBitmaps", "", curConI.CacheBitmaps)
 
                     xW.WriteAttributeString("RedirectDiskDrives", "", curConI.RedirectDiskDrives)
@@ -701,6 +709,8 @@ Namespace Config
                         xW.WriteAttributeString("InheritDescription", "", curConI.Inherit.Description)
                         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)
@@ -748,6 +758,8 @@ Namespace Config
                         xW.WriteAttributeString("InheritDescription", "", False)
                         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)
@@ -828,10 +840,10 @@ Namespace Config
                     csvLn += "Domain;"
                 End If
 
-                csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;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;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)
@@ -882,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.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.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)

mRemoteV1/Connection/Connection.Info.vb

@@ -706,6 +706,60 @@ Namespace Connection
                 Me._DisplayThemes = value
             End Set
         End Property
+
+        Private _EnableFontSmoothing As Boolean = My.Settings.ConDefaultEnableFontSmoothing
+        <LocalizedCategory("strCategoryAppearance", 5), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameEnableFontSmoothing"), _
+            LocalizedDescription("strPropertyDescriptionEnableFontSmoothing"), _
+            TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
+        Public Property EnableFontSmoothing() As Boolean
+            Get
+                If Me._Inherit.EnableFontSmoothing 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.EnableFontSmoothing
+                Else
+                    Return Me._EnableFontSmoothing
+                End If
+            End Get
+            Set(ByVal value As Boolean)
+                Me._EnableFontSmoothing = value
+            End Set
+        End Property
+
+        Private _EnableDesktopComposition As Boolean = My.Settings.ConDefaultEnableDesktopComposition
+        <LocalizedCategory("strCategoryAppearance", 5), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameEnableDesktopComposition"), _
+            LocalizedDescription("strPropertyDescriptionEnableDesktopComposition"), _
+            TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
+        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
@@ -1957,6 +2011,36 @@ Namespace Connection
                     Me._DisplayThemes = value
                 End Set
             End Property
+
+            Private _EnableFontSmoothing As Boolean = My.Settings.InhDefaultEnableFontSmoothing
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                Browsable(True), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEnableFontSmoothing"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEnableFontSmoothing"), _
+                TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
+            Public Property EnableFontSmoothing() As Boolean
+                Get
+                    Return Me._EnableFontSmoothing
+                End Get
+                Set(ByVal value As Boolean)
+                    Me._EnableFontSmoothing = value
+                End Set
+            End Property
+
+            Private _EnableDesktopComposition As Boolean = My.Settings.InhDefaultEnableDesktopComposition
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                Browsable(True), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameEnableDesktopComposition"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionEnableEnableDesktopComposition"), _
+                TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
+            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

mRemoteV1/Connection/Connection.Protocol.ICA.vb

@@ -168,6 +168,8 @@ Namespace Connection
                 Select Case Info.Colors
                     Case RDP.RDPColors.Colors256
                         ICA.SetProp("DesiredColor", 2)
+                    Case RDP.RDPColors.Colors15Bit
+                        ICA.SetProp("DesiredColor", 4)
                     Case RDP.RDPColors.Colors16Bit
                         ICA.SetProp("DesiredColor", 4)
                     Case Else

mRemoteV1/Connection/Connection.Protocol.RDP.vb

@@ -334,7 +334,15 @@ Namespace Connection
                         pFlags += Int(Connection.Protocol.RDP.RDPPerformanceFlags.DisableWallpaper)
                     End If
 
-                    RDP.AdvancedSettings2.PerformanceFlags = pFlags
+                    If Me.Info.EnableFontSmoothing Then
+                        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)
                 End Try
@@ -410,6 +418,8 @@ Namespace Connection
             Public Enum RDPColors
                 <LocalizedDescription("strRDP256Colors")> _
                 Colors256 = 8
+                <LocalizedDescription("strRDP32768Colors")> _
+                Colors15Bit = 15
                 <LocalizedDescription("strRDP65536Colors")> _
                 Colors16Bit = 16
                 <LocalizedDescription("strRDP16777216Colors")> _
@@ -429,17 +439,21 @@ Namespace Connection
 
             Private Enum RDPPerformanceFlags
                 <Description("strRDPDisableWallpaper")> _
-                DisableWallpaper = 1
+                DisableWallpaper = &H1
                 <Description("strRDPDisableFullWindowdrag")> _
-                DisableFullWindowDrag = 2
+                DisableFullWindowDrag = &H2
                 <Description("strRDPDisableMenuAnimations")> _
-                DisableMenuAnimations = 4
+                DisableMenuAnimations = &H4
                 <Description("strRDPDisableThemes")> _
-                DisableThemes = 8
+                DisableThemes = &H8
                 <Description("strRDPDisableCursorShadow")> _
-                DisableCursorShadow = 20
+                DisableCursorShadow = &H20
                 <Description("strRDPDisableCursorblinking")> _
-                DisableCursorBlinking = 40
+                DisableCursorBlinking = &H40
+                <Description("strRDPEnableFontSmoothing")> _
+                EnableFontSmoothing = &H80
+                <Description("strRDPEnableDesktopComposition")> _
+                EnableDesktopComposition = &H100
             End Enum
 
             Public Enum RDPResolutions

mRemoteV1/Help/SQLScript.txt

@@ -37,6 +37,8 @@ CREATE TABLE [dbo].[tblCons] (
 	[Resolution] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
 	[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 ,
@@ -72,6 +74,8 @@ CREATE TABLE [dbo].[tblCons] (
 	[InheritDescription] [bit] NOT NULL ,
 	[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 ,

mRemoteV1/Language/Resources.de.resx

@@ -994,7 +994,7 @@ Wenn Sie noch immer Probleme mit ICA haben, konsultieren sie bitte das mRemoteNG
   <data name="strCcGeckoFailed" xml:space="preserve">
     <value>Um die Gecko Rendering Engine benutzen zu können benötigen Sie XULrunner 1.8.1.x und einen korrekt eingetragenen Pfad in den Optionen.
 Hier können Sie XULrunner 1.8.1.3 herunterladen: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/
-Wenn der Download abgeschlossen ist entpacken Sie das Paket (Der Speicherort ist dabei ihnen überlassen). Als nächstes öffnen Sie (in mRemote) Extras - Optionen - Erweitert und geben Sie den korrekten Pfad im XULrunner Feld an.
+Wenn der Download abgeschlossen ist entpacken Sie das Paket (Der Speicherort ist dabei ihnen überlassen). Als nächstes öffnen Sie (in mRemoteNG) Extras - Optionen - Erweitert und geben Sie den korrekten Pfad im XULrunner Feld an.
 Wenn Sie noch immer Probleme mit der Gecko Engine in mRemote haben, konsultieren Sie bitte das mRemoteNG Forum: http://forum.mremoteng.org/</value>
   </data>
   <data name="strCcEOLOK" xml:space="preserve">
@@ -1016,7 +1016,7 @@ Wenn Sie noch immer Probleme mit der (RDP) Sitzungs Funktion in mRemoteNG haben,
     <value>Anfang/Ende</value>
   </data>
   <data name="strAllowOnlySingleInstance" xml:space="preserve">
-    <value>Nur eine Instanz zulassen (mRemote Neustart benötigt)</value>
+    <value>Nur eine Instanz zulassen (mRemoteNG Neustart benötigt)</value>
   </data>
   <data name="strReconnectAtStartup" xml:space="preserve">
     <value>Offene Verbindungen speichern und beim nächsten Start wiederverbinden</value>
@@ -1360,9 +1360,6 @@ Wenn Sie noch immer Probleme mit der (RDP) Sitzungs Funktion in mRemoteNG haben,
   <data name="strCurrentVersion" xml:space="preserve">
     <value>Aktuelle Version</value>
   </data>
-  <data name="strVersion" xml:space="preserve">
-    <value>Version</value>
-  </data>
   <data name="strUpdateDownloadComplete" xml:space="preserve">
     <value>Download fertiggestellt!
 mRemoteNG wird nun geschlossen und die Installation gestartet.</value>
@@ -1395,7 +1392,7 @@ mRemoteNG wird nun geschlossen und die Installation gestartet.</value>
     <value>16777216 Farben (24Bit)</value>
   </data>
   <data name="strRDP4294967296Colors" xml:space="preserve">
-    <value>4294967296 Farben (32Bit)</value>
+    <value>16777216 Farben (32Bit)</value>
   </data>
   <data name="strRDPDisableWallpaper" xml:space="preserve">
     <value>Entferne Hintergrundbild</value>
@@ -1465,9 +1462,6 @@ Bitte verwenden Sie Datei - Verbindungen laden für normale Verbindungs Dateien!
   <data name="strAddNodeFromXmlFailed" xml:space="preserve">
     <value>Knoten von XML laden ist fehlgeschlagen!</value>
   </data>
-  <data name="strGetConnectionInfoFromXmlFailed" xml:space="preserve">
-    <value>Verbindungs Informationen von XML holen ist fehlgeschlagen!</value>
-  </data>
   <data name="strCouldNotCreateNewConnectionsFile" xml:space="preserve">
     <value>Kann keine neue Verbindungsdatei erstellen!</value>
   </data>
@@ -1680,7 +1674,7 @@ Starte mit neuer Datei.</value>
     <value>Setzen der RDP Fehlderbehandlungsroutine fehlgeschlagen!</value>
   </data>
   <data name="strRdpControlCreationFailed" xml:space="preserve">
-    <value>Konte das RDP Plugin nicht einbinden, bitte prüfen Sie die mRemote Voraussetzungen.</value>
+    <value>Konte das RDP Plugin nicht einbinden, bitte prüfen Sie die mRemoteNG Voraussetzungen.</value>
   </data>
   <data name="strRdpSetPropsFailed" xml:space="preserve">
     <value>Setzen der RDP Parameter fehlgeschlagen!</value>
@@ -1960,4 +1954,7 @@ Fehler Beschreibung: {1}</value>
   <data name="strGeneral" xml:space="preserve">
     <value>Allgemein</value>
   </data>
+  <data name="strRDP32768Colors" xml:space="preserve">
+    <value>32768 Farben (15Bit)</value>
+  </data>
 </root>

mRemoteV1/Language/Resources.en-US.resx

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-	<!-- 
+  <!-- 
     Microsoft ResX Schema 
     
     Version 2.0
@@ -59,80 +59,95 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="metadata">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" />
-							</xsd:sequence>
-							<xsd:attribute name="name" use="required" type="xsd:string" />
-							<xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" />
-							<xsd:attribute ref="xml:space" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="assembly">
-						<xsd:complexType>
-							<xsd:attribute name="alias" type="xsd:string" />
-							<xsd:attribute name="name" type="xsd:string" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-							<xsd:attribute ref="xml:space" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>2.0</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<data name="strPropertyDescriptionColors" xml:space="preserve">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="strPropertyDescriptionColors" xml:space="preserve">
     <value>Select the color quality to be used.</value>
   </data>
-	<data name="strPropertyNameColors" xml:space="preserve">
+  <data name="strPropertyNameColors" xml:space="preserve">
     <value>Colors</value>
   </data>
-	<data name="strComponentsCheck" xml:space="preserve">
-		<value>Components Check</value>
-	</data>
-	<data name="strCcAlwaysShowScreen" xml:space="preserve">
-		<value>Always show this screen at startup</value>
-	</data>
-	<data name="strCcCheckAgain" xml:space="preserve">
-		<value>Refresh</value>
-	</data>
-	<data name="strConnecting" xml:space="preserve">
-		<value>Connecting...</value>
-	</data>
+  <data name="strComponentsCheck" xml:space="preserve">
+    <value>Components Check</value>
+  </data>
+  <data name="strCcAlwaysShowScreen" xml:space="preserve">
+    <value>Always show this screen at startup</value>
+  </data>
+  <data name="strCcCheckAgain" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
+  <data name="strConnecting" xml:space="preserve">
+    <value>Connecting...</value>
+  </data>
+  <data name="strRDP16777216Colors" xml:space="preserve">
+    <value>16777216 Colors (24-bit)</value>
+  </data>
+  <data name="strRDP256Colors" xml:space="preserve">
+    <value>256 Colors (8-bit)</value>
+  </data>
+  <data name="strRDP4294967296Colors" xml:space="preserve">
+    <value>16777216 Colors (32-bit)</value>
+  </data>
+  <data name="strRDP65536Colors" xml:space="preserve">
+    <value>65536 Colors (16-bit)</value>
+  </data>
+  <data name="strRDP32768Colors" xml:space="preserve">
+    <value>32768 Colors (15-bit)</value>
+  </data>
 </root>

mRemoteV1/My Project/Resources.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.4959
+'     Runtime Version:2.0.50727.5444
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -2052,7 +2052,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 128 Bit.
+        '''  Looks up a localized string similar to 128-bit.
         '''</summary>
         Friend ReadOnly Property strEnc128Bit() As String
             Get
@@ -2061,7 +2061,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 128Bit (logon only).
+        '''  Looks up a localized string similar to 128-bit (logon only).
         '''</summary>
         Friend ReadOnly Property strEnc128BitLogonOnly() As String
             Get
@@ -2070,7 +2070,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 40 Bit.
+        '''  Looks up a localized string similar to 40-bit.
         '''</summary>
         Friend ReadOnly Property strEnc40Bit() As String
             Get
@@ -2079,7 +2079,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 56 Bit.
+        '''  Looks up a localized string similar to 56-bit.
         '''</summary>
         Friend ReadOnly Property strEnc56Bit() As String
             Get
@@ -2313,7 +2313,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Get Connection Info From Xml failed.
+        '''  Looks up a localized string similar to An error occured while loading the connection entry for &quot;{0}&quot; from &quot;{1}&quot;. {2}.
         '''</summary>
         Friend ReadOnly Property strGetConnectionInfoFromXmlFailed() As String
             Get
@@ -3573,7 +3573,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to my current credentials (windows logon info).
+        '''  Looks up a localized string similar to My current credentials (Windows logon information).
         '''</summary>
         Friend ReadOnly Property strMyCurrentWindowsCreds() As String
             Get
@@ -3663,7 +3663,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to none.
+        '''  Looks up a localized string similar to None.
         '''</summary>
         Friend ReadOnly Property strNoInformation() As String
             Get
@@ -3879,6 +3879,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Select whether to use desktop composition or not..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionEnableDesktopComposition() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionEnableDesktopComposition", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Select whether to use font smoothing or not..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionEnableFontSmoothing() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionEnableFontSmoothing", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Select the encoding mode to be used..
         '''</summary>
@@ -4302,6 +4320,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Desktop Composition.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameEnableDesktopComposition() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameEnableDesktopComposition", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Font Smoothing.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameEnableFontSmoothing() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameEnableFontSmoothing", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Encoding.
         '''</summary>
@@ -4864,7 +4900,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 16777216 Colors (24bit).
+        '''  Looks up a localized string similar to 16777216 Colours (24-bit).
         '''</summary>
         Friend ReadOnly Property strRDP16777216Colors() As String
             Get
@@ -4873,7 +4909,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 256 Colors (8bit).
+        '''  Looks up a localized string similar to 256 Colours (8-bit).
         '''</summary>
         Friend ReadOnly Property strRDP256Colors() As String
             Get
@@ -4882,7 +4918,16 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 4294967296 Colors (32bit).
+        '''  Looks up a localized string similar to 32768 Colours (15-bit).
+        '''</summary>
+        Friend ReadOnly Property strRDP32768Colors() As String
+            Get
+                Return ResourceManager.GetString("strRDP32768Colors", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to 16777216 Colours (32-bit).
         '''</summary>
         Friend ReadOnly Property strRDP4294967296Colors() As String
             Get
@@ -4891,7 +4936,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to 65536 Colors (16bit).
+        '''  Looks up a localized string similar to 65536 Colours (16-bit).
         '''</summary>
         Friend ReadOnly Property strRDP65536Colors() As String
             Get
@@ -4945,7 +4990,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Couldn&apos;t create RDP control, please check mRemote requirements..
+        '''  Looks up a localized string similar to Couldn&apos;t create RDP control, please check mRemoteNG requirements..
         '''</summary>
         Friend ReadOnly Property strRdpControlCreationFailed() As String
             Get
@@ -5728,7 +5773,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Ssh Transfee End (UI.Window.SSHTransfer) failed!.
+        '''  Looks up a localized string similar to SSH Transfer End (UI.Window.SSHTransfer) failed!.
         '''</summary>
         Friend ReadOnly Property strSSHTransferEndFailed() As String
             Get
@@ -5827,7 +5872,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to the follwing.
+        '''  Looks up a localized string similar to The follwing.
         '''</summary>
         Friend ReadOnly Property strTheFollowing() As String
             Get

mRemoteV1/My Project/Resources.resx

@@ -1223,7 +1223,7 @@
     <value>Connecting...</value>
   </data>
   <data name="strRDP256Colors" xml:space="preserve">
-    <value>256 Colors (8bit)</value>
+    <value>256 Colours (8-bit)</value>
   </data>
   <data name="strRDPSoundBringToThisComputer" xml:space="preserve">
     <value>Bring to this computer</value>
@@ -1540,13 +1540,13 @@ If you are still not able to pass this check or use the (RDP) Sessions feature i
     <value>Logoff</value>
   </data>
   <data name="strTheFollowing" xml:space="preserve">
-    <value>the follwing</value>
+    <value>The follwing</value>
   </data>
   <data name="strMyCurrentWindowsCreds" xml:space="preserve">
-    <value>my current credentials (windows logon info)</value>
+    <value>My current credentials (Windows logon information)</value>
   </data>
   <data name="strNoInformation" xml:space="preserve">
-    <value>none</value>
+    <value>None</value>
   </data>
   <data name="strSingleClickOnOpenConnectionSwitchesToIt" xml:space="preserve">
     <value>Single click on opened connection switches to it</value>
@@ -1703,13 +1703,13 @@ mRemoteNG will now quit and begin with the installation.</value>
     <value>CTRL-ESC</value>
   </data>
   <data name="strRDP65536Colors" xml:space="preserve">
-    <value>65536 Colors (16bit)</value>
+    <value>65536 Colours (16-bit)</value>
   </data>
   <data name="strRDP16777216Colors" xml:space="preserve">
-    <value>16777216 Colors (24bit)</value>
+    <value>16777216 Colours (24-bit)</value>
   </data>
   <data name="strRDP4294967296Colors" xml:space="preserve">
-    <value>4294967296 Colors (32bit)</value>
+    <value>16777216 Colours (32-bit)</value>
   </data>
   <data name="strRDPDisableWallpaper" xml:space="preserve">
     <value>Disable Wallpaper</value>
@@ -1763,7 +1763,7 @@ mRemoteNG will now quit and begin with the installation.</value>
     <value>Transfer successful!</value>
   </data>
   <data name="strSSHTransferEndFailed" xml:space="preserve">
-    <value>Ssh Transfee End (UI.Window.SSHTransfer) failed!</value>
+    <value>SSH Transfer End (UI.Window.SSHTransfer) failed!</value>
   </data>
   <data name="strTransfer" xml:space="preserve">
     <value>Transfer</value>
@@ -1783,7 +1783,7 @@ Please use File - Load Connections for normal connection files!</value>
     <value>AddNodeFromXML failed!</value>
   </data>
   <data name="strGetConnectionInfoFromXmlFailed" xml:space="preserve">
-    <value>Get Connection Info From Xml failed</value>
+    <value>An error occured while loading the connection entry for "{0}" from "{1}". {2}</value>
   </data>
   <data name="strCouldNotCreateNewConnectionsFile" xml:space="preserve">
     <value>Couldn't create new connections file!</value>
@@ -1997,7 +1997,7 @@ Starting with new connections file.</value>
     <value>RDP SetEventHandlers failed!</value>
   </data>
   <data name="strRdpControlCreationFailed" xml:space="preserve">
-    <value>Couldn't create RDP control, please check mRemote requirements.</value>
+    <value>Couldn't create RDP control, please check mRemoteNG requirements.</value>
   </data>
   <data name="strRdpSetPropsFailed" xml:space="preserve">
     <value>RDP SetProps failed!</value>
@@ -2060,16 +2060,16 @@ Starting with new connections file.</value>
     <value>Basic</value>
   </data>
   <data name="strEnc128BitLogonOnly" xml:space="preserve">
-    <value>128Bit (logon only)</value>
+    <value>128-bit (logon only)</value>
   </data>
   <data name="strEnc40Bit" xml:space="preserve">
-    <value>40 Bit</value>
+    <value>40-bit</value>
   </data>
   <data name="strEnc56Bit" xml:space="preserve">
-    <value>56 Bit</value>
+    <value>56-bit</value>
   </data>
   <data name="strEnc128Bit" xml:space="preserve">
-    <value>128 Bit</value>
+    <value>128-bit</value>
   </data>
   <data name="strIntAppConnectionFailed" xml:space="preserve">
     <value>Connection failed!</value>
@@ -2304,4 +2304,19 @@ Error Description: {1}</value>
   <data name="strAskUpdatesMainInstruction" xml:space="preserve">
     <value>Automatic update settings</value>
   </data>
+  <data name="strRDP32768Colors" xml:space="preserve">
+    <value>32768 Colours (15-bit)</value>
+  </data>
+  <data name="strPropertyDescriptionEnableFontSmoothing" xml:space="preserve">
+    <value>Select whether to use font smoothing or not.</value>
+  </data>
+  <data name="strPropertyNameEnableFontSmoothing" xml:space="preserve">
+    <value>Font Smoothing</value>
+  </data>
+  <data name="strPropertyDescriptionEnableDesktopComposition" xml:space="preserve">
+    <value>Select whether to use desktop composition or not.</value>
+  </data>
+  <data name="strPropertyNameEnableDesktopComposition" xml:space="preserve">
+    <value>Desktop Composition</value>
+  </data>
 </root>

mRemoteV1/My Project/Settings.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.4959
+'     Runtime Version:2.0.50727.5444
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -2095,7 +2095,7 @@ Namespace My
         
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("de,en,en-US")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("de,en,en-US,fr")>  _
         Public ReadOnly Property SupportedUICultures() As String
             Get
                 Return CType(Me("SupportedUICultures"),String)
@@ -2153,6 +2153,58 @@ Namespace My
                 Me("ConDefaultRDGatewayDomain") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property ConDefaultEnableFontSmoothing() As Boolean
+            Get
+                Return CType(Me("ConDefaultEnableFontSmoothing"),Boolean)
+            End Get
+            Set
+                Me("ConDefaultEnableFontSmoothing") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property InhDefaultEnableFontSmoothing() As Boolean
+            Get
+                Return CType(Me("InhDefaultEnableFontSmoothing"),Boolean)
+            End Get
+            Set
+                Me("InhDefaultEnableFontSmoothing") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property ConDefaultEnableDesktopComposition() As Boolean
+            Get
+                Return CType(Me("ConDefaultEnableDesktopComposition"),Boolean)
+            End Get
+            Set
+                Me("ConDefaultEnableDesktopComposition") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        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
 

mRemoteV1/My Project/Settings.settings

@@ -474,7 +474,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="SupportedUICultures" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">de,en,en-US</Value>
+      <Value Profile="(Default)">de,en,en-US,fr</Value>
     </Setting>
     <Setting Name="ConDefaultRDGatewayHostname" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -488,5 +488,17 @@
     <Setting Name="ConDefaultRDGatewayDomain" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="ConDefaultEnableFontSmoothing" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultEnableFontSmoothing" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="ConDefaultEnableDesktopComposition" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultEnableDesktopComposition" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

mRemoteV1/Tree/Tree.Node.vb

@@ -479,13 +479,21 @@ Namespace Tree
 
         Public Shared Sub Sort(ByVal treeNode As TreeNode, ByVal sortType As Tools.Controls.TreeNodeSorter.SortType)
             Try
-                If Tree.Node.GetNodeType(treeNode) <> Type.Connection Then
-                    Dim ns As New Tools.Controls.TreeNodeSorter(treeNode, sortType)
-
-                    _TreeView.TreeViewNodeSorter = ns
-                    _TreeView.Sort()
-                    _TreeView.Sorted = False
+                If treeNode Is Nothing Then
+                    treeNode = _TreeView.Nodes.Item(0)
+                ElseIf Tree.Node.GetNodeType(treeNode) = Type.Connection Then
+                    treeNode = treeNode.Parent
                 End If
+
+                Dim ns As New Tools.Controls.TreeNodeSorter(treeNode, sortType)
+
+                _TreeView.TreeViewNodeSorter = ns
+                _TreeView.Sort()
+                _TreeView.Sorted = False
+
+                For Each childNode As TreeNode In treeNode.Nodes
+                    If GetNodeType(childNode) = Type.Container Then Sort(childNode, sortType)
+                Next
             Catch ex As Exception
                 mC.AddMessage(Messages.MessageClass.ErrorMsg, "Sort nodes failed" & vbNewLine & ex.Message, True)
             End Try

mRemoteV1/UI/UI.Window.Config.vb

@@ -542,6 +542,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
                                 strHide.Add("PuttySession")
@@ -575,6 +577,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
@@ -610,6 +614,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
@@ -645,6 +651,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
@@ -682,6 +690,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
@@ -719,6 +729,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
@@ -756,6 +768,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
@@ -791,6 +805,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ExtApp")
                                 strHide.Add("ICAEncryption")
@@ -823,6 +839,8 @@ Namespace UI
                             Case mRemoteNG.Connection.Protocol.Protocols.ICA
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("ExtApp")
                                 strHide.Add("Port")
                                 strHide.Add("PuttySession")
@@ -857,6 +875,8 @@ Namespace UI
                                 strHide.Add("Colors")
                                 strHide.Add("DisplayThemes")
                                 strHide.Add("DisplayWallpaper")
+                                strHide.Add("EnableFontSmoothing")
+                                strHide.Add("EnableDesktopComposition")
                                 strHide.Add("Domain")
                                 strHide.Add("ICAEncryption")
                                 strHide.Add("PuttySession")
@@ -911,6 +931,14 @@ Namespace UI
                                     strHide.Add("DisplayWallpaper")
                                 End If
 
+                                If .EnableFontSmoothing Then
+                                    strHide.Add("EnableFontSmoothing")
+                                End If
+
+                                If .EnableDesktopComposition Then
+                                    strHide.Add("EnableDesktopComposition")
+                                End If
+
                                 If .Domain Then
                                     strHide.Add("Domain")
                                 End If

mRemoteV1/UI/UI.Window.Tree.vb

@@ -47,6 +47,9 @@ Namespace UI
             Friend WithEvents cMenTreeToolsImportExportImportFromPortScan As System.Windows.Forms.ToolStripMenuItem
             Friend WithEvents cMenTreeConnectWithOptionsChoosePanelBeforeConnecting As System.Windows.Forms.ToolStripMenuItem
             Friend WithEvents cMenTreeConnectWithOptionsDontConnectToConsoleSession As System.Windows.Forms.ToolStripMenuItem
+            Friend WithEvents mMenSortAscending As System.Windows.Forms.ToolStripMenuItem
+            Friend WithEvents mMenAddConnection As System.Windows.Forms.ToolStripMenuItem
+            Friend WithEvents mMenAddFolder As System.Windows.Forms.ToolStripMenuItem
             Public WithEvents tvConnections As System.Windows.Forms.TreeView
             Private Sub InitializeComponent()
                 Me.components = New System.ComponentModel.Container
@@ -88,9 +91,12 @@ Namespace UI
                 Me.PictureBox1 = New System.Windows.Forms.PictureBox
                 Me.txtSearch = New System.Windows.Forms.TextBox
                 Me.msMain = New System.Windows.Forms.MenuStrip
+                Me.mMenAddConnection = New System.Windows.Forms.ToolStripMenuItem
+                Me.mMenAddFolder = New System.Windows.Forms.ToolStripMenuItem
                 Me.mMenView = New System.Windows.Forms.ToolStripMenuItem
                 Me.mMenViewExpandAllFolders = New System.Windows.Forms.ToolStripMenuItem
                 Me.mMenViewCollapseAllFolders = New System.Windows.Forms.ToolStripMenuItem
+                Me.mMenSortAscending = New System.Windows.Forms.ToolStripMenuItem
                 Me.cMenTree.SuspendLayout()
                 Me.pnlConnections.SuspendLayout()
                 CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -124,7 +130,7 @@ Namespace UI
                 Me.cMenTree.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenTreeAddConnection, Me.cMenTreeAddFolder, Me.cMenTreeSep1, Me.cMenTreeConnect, Me.cMenTreeConnectWithOptions, Me.cMenTreeDisconnect, Me.cMenTreeSep2, Me.cMenTreeToolsTransferFile, Me.cMenTreeToolsImportExport, Me.cMenTreeToolsSort, Me.cMenTreeToolsExternalApps, Me.cMenTreeSep3, Me.cMenTreeDuplicate, Me.cMenTreeRename, Me.cMenTreeDelete, Me.cMenTreeSep4, Me.cMenTreeMoveUp, Me.cMenTreeMoveDown})
                 Me.cMenTree.Name = "cMenTree"
                 Me.cMenTree.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-                Me.cMenTree.Size = New System.Drawing.Size(187, 358)
+                Me.cMenTree.Size = New System.Drawing.Size(187, 336)
                 '
                 'cMenTreeAddConnection
                 '
@@ -376,14 +382,29 @@ Namespace UI
                 'msMain
                 '
                 Me.msMain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-                Me.msMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenView})
+                Me.msMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenAddConnection, Me.mMenAddFolder, Me.mMenView, Me.mMenSortAscending})
                 Me.msMain.Location = New System.Drawing.Point(0, 0)
                 Me.msMain.Name = "msMain"
                 Me.msMain.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
+                Me.msMain.ShowItemToolTips = True
                 Me.msMain.Size = New System.Drawing.Size(192, 24)
                 Me.msMain.TabIndex = 10
                 Me.msMain.Text = "MenuStrip1"
                 '
+                'mMenAddConnection
+                '
+                Me.mMenAddConnection.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+                Me.mMenAddConnection.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Add
+                Me.mMenAddConnection.Name = "mMenAddConnection"
+                Me.mMenAddConnection.Size = New System.Drawing.Size(28, 20)
+                '
+                'mMenAddFolder
+                '
+                Me.mMenAddFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+                Me.mMenAddFolder.Image = Global.mRemoteNG.My.Resources.Resources.Folder_Add
+                Me.mMenAddFolder.Name = "mMenAddFolder"
+                Me.mMenAddFolder.Size = New System.Drawing.Size(28, 20)
+                '
                 'mMenView
                 '
                 Me.mMenView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -407,6 +428,13 @@ Namespace UI
                 Me.mMenViewCollapseAllFolders.Size = New System.Drawing.Size(161, 22)
                 Me.mMenViewCollapseAllFolders.Text = "Collapse all folders"
                 '
+                'mMenSortAscending
+                '
+                Me.mMenSortAscending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+                Me.mMenSortAscending.Image = Global.mRemoteNG.My.Resources.Resources.Sort_AZ
+                Me.mMenSortAscending.Name = "mMenSortAscending"
+                Me.mMenSortAscending.Size = New System.Drawing.Size(28, 20)
+                '
                 'Tree
                 '
                 Me.ClientSize = New System.Drawing.Size(192, 453)
@@ -492,9 +520,12 @@ Namespace UI
                 cMenTreeDelete.Text = My.Resources.strMenuDelete
                 cMenTreeMoveUp.Text = My.Resources.strMoveUp
                 cMenTreeMoveDown.Text = My.Resources.strMoveDown
-                mMenView.Text = My.Resources.strMenuView
+                mMenAddConnection.ToolTipText = My.Resources.strAddConnection
+                mMenAddFolder.ToolTipText = My.Resources.strAddFolder
+                mMenView.ToolTipText = My.Resources.strMenuView.Replace("&", "")
                 mMenViewExpandAllFolders.Text = My.Resources.strExpandAllFolders
                 mMenViewCollapseAllFolders.Text = My.Resources.strCollapseAllFolders
+                mMenSortAscending.ToolTipText = My.Resources.strSortAsc
                 TabText = My.Resources.strConnections
                 Text = My.Resources.strConnections
             End Sub
@@ -671,11 +702,8 @@ Namespace UI
 
                             Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Enabled = True
 
-
                             Me.cMenTreeToolsImportExport.Enabled = False
 
-                            Me.cMenTreeToolsSort.Enabled = False
-
                             Me.cMenTreeToolsExternalApps.Enabled = True
 
                             Me.cMenTreeDuplicate.Enabled = True
@@ -708,8 +736,6 @@ Namespace UI
                             Me.cMenTreeToolsImportExportImportFromAD.Enabled = True
                             Me.cMenTreeToolsImportExportImportmRemoteXML.Enabled = True
 
-                            Me.cMenTreeToolsSort.Enabled = True
-
                             Me.cMenTreeToolsExternalApps.Enabled = False
 
                             Me.cMenTreeDuplicate.Enabled = True
@@ -732,8 +758,6 @@ Namespace UI
                             Me.cMenTreeToolsImportExportImportFromAD.Enabled = True
                             Me.cMenTreeToolsImportExportImportmRemoteXML.Enabled = True
 
-                            Me.cMenTreeToolsSort.Enabled = True
-
                             Me.cMenTreeToolsExternalApps.Enabled = False
 
                             Me.cMenTreeDuplicate.Enabled = False
@@ -899,12 +923,12 @@ Namespace UI
 #End Region
 
 #Region "Tree Context Menu"
-            Private Sub cMenTreeAddConnection_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeAddConnection.Click
+            Private Sub cMenTreeAddConnection_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeAddConnection.Click, mMenAddConnection.Click
                 Me.AddConnection()
                 SaveConnectionsBG()
             End Sub
 
-            Private Sub cMenTreeAddFolder_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeAddFolder.Click
+            Private Sub cMenTreeAddFolder_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeAddFolder.Click, mMenAddFolder.Click
                 Me.AddFolder()
                 SaveConnectionsBG()
             End Sub
@@ -957,13 +981,24 @@ Namespace UI
                 Me.ImportFromPortScan()
             End Sub
 
+            Private Sub mMenSortAscending_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenSortAscending.Click
+                Me.tvConnections.BeginUpdate()
+                mRemoteNG.Tree.Node.Sort(Me.tvConnections.Nodes.Item(0), Tools.Controls.TreeNodeSorter.SortType.Ascending)
+                Me.tvConnections.EndUpdate()
+                SaveConnectionsBG()
+            End Sub
+
             Private Sub cMenTreeToolsSortAscending_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeToolsSortAscending.Click
+                Me.tvConnections.BeginUpdate()
                 mRemoteNG.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Ascending)
+                Me.tvConnections.EndUpdate()
                 SaveConnectionsBG()
             End Sub
 
             Private Sub cMenTreeToolsSortDescending_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeToolsSortDescending.Click
+                Me.tvConnections.BeginUpdate()
                 mRemoteNG.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Descending)
+                Me.tvConnections.EndUpdate()
                 SaveConnectionsBG()
             End Sub
 
@@ -1008,6 +1043,7 @@ Namespace UI
 
                     If nNode IsNot Nothing Then
                         Dim nConI As New mRemoteNG.Connection.Info()
+                        If Me.tvConnections.SelectedNode Is Nothing Then Me.tvConnections.SelectedNode = Me.tvConnections.Nodes.Item(0)
                         If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Container.Info Then
                             nConI.Parent = Me.tvConnections.SelectedNode.Tag
                         Else
@@ -1200,6 +1236,7 @@ Namespace UI
             End Sub
 
             Private Sub mMenViewCollapseAllFolders_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewCollapseAllFolders.Click
+                If Me.tvConnections.SelectedNode.IsEditing Then Me.tvConnections.SelectedNode.EndEdit(False)
                 mRemoteNG.Tree.Node.CollapseAllNodes()
             End Sub
 #End Region
@@ -1261,7 +1298,6 @@ Namespace UI
                 End Try
             End Sub
 #End Region
-
         End Class
     End Namespace
 End Namespace

mRemoteV1/app.config

@@ -542,12 +542,24 @@
             <setting name="ConDefaultRDGatewayDomain" serializeAs="String">
                 <value />
             </setting>
+            <setting name="ConDefaultEnableFontSmoothing" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="InhDefaultEnableFontSmoothing" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ConDefaultEnableDesktopComposition" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="InhDefaultEnableDesktopComposition" serializeAs="String">
+                <value>False</value>
+            </setting>
         </mRemoteNG.My.MySettings>
     </userSettings>
     <applicationSettings>
         <mRemoteNG.My.MySettings>
             <setting name="SupportedUICultures" serializeAs="String">
-                <value>de,en,en-US</value>
+                <value>de,en,en-US,fr</value>
             </setting>
         </mRemoteNG.My.MySettings>
     </applicationSettings>

mRemoteV1/mRemoteV1.vbproj

@@ -346,6 +346,9 @@
     <EmbeddedResource Include="Language\Resources.en-US.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Language\Resources.fr.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.vb</LastGenOutput>
@@ -765,6 +768,9 @@
     <Content Include="Icons\mRemote.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Icons\mRemoteNG.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Icons\Remote Desktop.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>