From ec850f6c15d488afd6b621b3e68cd8c8b1da82e3 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Wed, 25 May 2011 19:06:16 -0500 Subject: [PATCH] Added 15-bit color option for RDP. Fixed the description for 32-bit color (8 bits are not used so it's the same number of colors as 24-bit). --- mRemoteV1/App/App.Runtime.vb | 2 ++ mRemoteV1/Config/Config.Connections.Load.vb | 2 ++ mRemoteV1/Connection/Connection.Protocol.ICA.vb | 2 ++ mRemoteV1/Connection/Connection.Protocol.RDP.vb | 2 ++ mRemoteV1/Language/Resources.de.resx | 5 ++++- mRemoteV1/Language/Resources.en-US.resx | 5 ++++- mRemoteV1/Language/Resources.fr.resx | 5 ++++- mRemoteV1/My Project/Resources.Designer.vb | 11 ++++++++++- mRemoteV1/My Project/Resources.resx | 5 ++++- 9 files changed, 34 insertions(+), 5 deletions(-) diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index b36f9206..ffdf2b88 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -886,6 +886,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 diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb index f2e5fad4..a3931a27 100644 --- a/mRemoteV1/Config/Config.Connections.Load.vb +++ b/mRemoteV1/Config/Config.Connections.Load.vb @@ -879,6 +879,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 diff --git a/mRemoteV1/Connection/Connection.Protocol.ICA.vb b/mRemoteV1/Connection/Connection.Protocol.ICA.vb index 0d89c788..c24ff708 100644 --- a/mRemoteV1/Connection/Connection.Protocol.ICA.vb +++ b/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 diff --git a/mRemoteV1/Connection/Connection.Protocol.RDP.vb b/mRemoteV1/Connection/Connection.Protocol.RDP.vb index 0f8902eb..cc09640f 100644 --- a/mRemoteV1/Connection/Connection.Protocol.RDP.vb +++ b/mRemoteV1/Connection/Connection.Protocol.RDP.vb @@ -410,6 +410,8 @@ Namespace Connection Public Enum RDPColors _ Colors256 = 8 + _ + Colors15Bit = 15 _ Colors16Bit = 16 _ diff --git a/mRemoteV1/Language/Resources.de.resx b/mRemoteV1/Language/Resources.de.resx index a2213642..f7fdbf24 100644 --- a/mRemoteV1/Language/Resources.de.resx +++ b/mRemoteV1/Language/Resources.de.resx @@ -1392,7 +1392,7 @@ mRemoteNG wird nun geschlossen und die Installation gestartet. 16777216 Farben (24Bit) - 4294967296 Farben (32Bit) + 16777216 Farben (32Bit) Entferne Hintergrundbild @@ -1957,4 +1957,7 @@ Fehler Beschreibung: {1} Allgemein + + 32768 Farben (15Bit) + \ No newline at end of file diff --git a/mRemoteV1/Language/Resources.en-US.resx b/mRemoteV1/Language/Resources.en-US.resx index 4757abb4..7abc7b3d 100644 --- a/mRemoteV1/Language/Resources.en-US.resx +++ b/mRemoteV1/Language/Resources.en-US.resx @@ -142,9 +142,12 @@ 256 Colors (8-bit) - 4294967296 Colors (32-bit) + 16777216 Colors (32-bit) 65536 Colors (16-bit) + + 32768 Colors (15-bit) + \ No newline at end of file diff --git a/mRemoteV1/Language/Resources.fr.resx b/mRemoteV1/Language/Resources.fr.resx index 62656d07..e4df380b 100644 --- a/mRemoteV1/Language/Resources.fr.resx +++ b/mRemoteV1/Language/Resources.fr.resx @@ -1108,7 +1108,7 @@ 16777216 couleurs (24 bits) - 4294967296 couleurs (32 bits) + 16777216 couleurs (32 bits) Désactiver papier peint @@ -1416,4 +1416,7 @@ Paramètres de mise à jour automatique + + 32768 couleurs (15 bits) + \ No newline at end of file diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index 9ffd7915..469f45d6 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -4882,7 +4882,16 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 4294967296 Colours (32-bit). + ''' Looks up a localized string similar to 32768 Colours (15-bit). + ''' + Friend ReadOnly Property strRDP32768Colors() As String + Get + Return ResourceManager.GetString("strRDP32768Colors", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to 16777216 Colours (32-bit). ''' Friend ReadOnly Property strRDP4294967296Colors() As String Get diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index a0a229f5..586483bb 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -1709,7 +1709,7 @@ mRemoteNG will now quit and begin with the installation. 16777216 Colours (24-bit) - 4294967296 Colours (32-bit) + 16777216 Colours (32-bit) Disable Wallpaper @@ -2304,4 +2304,7 @@ Error Description: {1} Automatic update settings + + 32768 Colours (15-bit) + \ No newline at end of file