Bugfixes in rdgateway inheritance, new translations, rewrite of inheritance / exclusion

* some more translations
* rdgateway inheritance implemented and fixed
* inheritance / exclusion of properties rewritten to use a list instead of string to array
  * this fixes some bugs that occured due to missing semicolons
This commit is contained in:
Andreas Rehm
2010-05-25 18:21:48 +02:00
parent 280c6678cb
commit e874292016
13 changed files with 779 additions and 126 deletions

View File

@@ -512,6 +512,7 @@ Namespace App
My.Settings.InhDefaultPostExtApp = .PostExtApp
My.Settings.InhDefaultMacAddress = .MacAddress
My.Settings.InhDefaultUserField = .UserField
' VNC inheritance
My.Settings.InhDefaultVNCAuthMode = .VNCAuthMode
My.Settings.InhDefaultVNCColors = .VNCColors
My.Settings.InhDefaultVNCCompression = .VNCCompression
@@ -523,7 +524,15 @@ Namespace App
My.Settings.InhDefaultVNCProxyUsername = .VNCProxyUsername
My.Settings.InhDefaultVNCSmartSizeMode = .VNCSmartSizeMode
My.Settings.InhDefaultVNCViewOnly = .VNCViewOnly
' Ext. App inheritance
My.Settings.InhDefaultExtApp = .ExtApp
' RDP gateway inheritance
My.Settings.InhDefaultRDGatewayUsageMethod = .RDGatewayUsageMethod
My.Settings.InhDefaultRDGatewayHostname = .RDGatewayHostname
My.Settings.InhDefaultRDGatewayUsername = .RDGatewayUsername
My.Settings.InhDefaultRDGatewayPassword = .RDGatewayPassword
My.Settings.InhDefaultRDGatewayDomain = .RDGatewayDomain
My.Settings.InhDefaultRDGatewayUseConnectionCredentials = .RDGatewayUseConnectionCredentials
End With
End Sub
#End Region

View File

@@ -18,7 +18,7 @@ Namespace Config
Private sqlQuery As SqlCommand
Private sqlRd As SqlDataReader
Private sqlDB As String = "mRemote"
Private sqlDB As String = "mRemoteNG"
Private selNode As TreeNode
#End Region
@@ -84,10 +84,6 @@ Namespace Config
End Set
End Property
Private _ConnectionFileName As String
Public Property ConnectionFileName() As String
Get

View File

@@ -8,7 +8,7 @@ Namespace Connection
Public Class Info
#Region "Properties"
#Region "1 Display"
Private _Name As String = "New Connection"
Private _Name As String = My.Resources.strNewConnection
<LocalizedCategory("strCategoryDisplay", 1), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameName"), _
@@ -977,7 +977,7 @@ Namespace Connection
End Set
End Property
#End Region
#Region "VNC"
#Region "8 VNC"
Private _VNCCompression As mRemoteNG.Connection.Protocol.VNC.Compression = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Compression), My.Settings.ConDefaultVNCCompression)
<LocalizedCategory("strCategoryAppearance", 5), _
Browsable(False), _
@@ -1274,7 +1274,6 @@ Namespace Connection
End Property
#End Region
Private _Inherit As Inheritance = New Inheritance(Me)
<Category(""), _
Browsable(False)> _
@@ -1299,7 +1298,6 @@ Namespace Connection
End Set
End Property
Private _IsContainer As Boolean = False
<Category(""), _
Browsable(False)> _
@@ -1447,11 +1445,13 @@ Namespace Connection
Me._Port = Connection.Protocol.IntApp.Defaults.Port
End Select
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't set default port" & vbNewLine & ex.Message)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionSetDefaultPortFailed & vbNewLine & ex.Message)
End Try
End Sub
#End Region
#Region "Inheritance"
Public Class Inheritance
Public Sub New(ByVal Parent As Object, Optional ByVal InheritEverything As Boolean = False)
Me._Parent = Parent
@@ -1515,6 +1515,14 @@ Namespace Connection
Me._VNCSmartSizeMode = val
Me._VNCViewOnly = val
Me._ExtApp = val
Me._RDGatewayDomain = val
Me._RDGatewayHostname = val
Me._RDGatewayPassword = val
Me._RDGatewayUsageMethod = val
Me._RDGatewayUseConnectionCredentials = val
Me._RDGatewayUsername = val
'Me._RDPAuthenticationLevel = val
End Sub
Private _Parent As Object
@@ -1541,7 +1549,6 @@ Namespace Connection
End Set
End Property
#Region "1 General"
<LocalizedCategory("strCategoryGeneral", 1), _
Browsable(True), _
@@ -1770,7 +1777,7 @@ Namespace Connection
End Property
#End Region
#Region "5 RD Gateway"
Private _RDGatewayUsageMethod As Boolean = False
Private _RDGatewayUsageMethod As Boolean = My.Settings.InhDefaultRDGatewayUsageMethod
<LocalizedCategory("strCategoryGateway", 5), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameRDGatewayUsageMethodInherit"), _
@@ -1784,7 +1791,7 @@ Namespace Connection
End Set
End Property
Private _RDGatewayHostname As Boolean = False
Private _RDGatewayHostname As Boolean = My.Settings.InhDefaultRDGatewayHostname
<LocalizedCategory("strCategoryGateway", 5), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameRDGatewayHostnameInherit"), _
@@ -1798,7 +1805,7 @@ Namespace Connection
End Set
End Property
Private _RDGatewayUseConnectionCredentials As Boolean = False
Private _RDGatewayUseConnectionCredentials As Boolean = My.Settings.InhDefaultRDGatewayUseConnectionCredentials
<LocalizedCategory("strCategoryGateway", 5), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameRDGatewayUseConnectionCredentialsInherit"), _
@@ -1812,7 +1819,7 @@ Namespace Connection
End Set
End Property
Private _RDGatewayUsername As Boolean = False
Private _RDGatewayUsername As Boolean = My.Settings.InhDefaultRDGatewayUsername
<LocalizedCategory("strCategoryGateway", 5), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameRDGatewayUsername"), _
@@ -1827,7 +1834,7 @@ Namespace Connection
End Set
End Property
Private _RDGatewayPassword As Boolean = False
Private _RDGatewayPassword As Boolean = My.Settings.InhDefaultRDGatewayPassword
<LocalizedCategory("strCategoryGateway", 5), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameRDGatewayPasswordInherit"), _
@@ -1842,7 +1849,7 @@ Namespace Connection
End Set
End Property
Private _RDGatewayDomain As Boolean = False
Private _RDGatewayDomain As Boolean = My.Settings.InhDefaultRDGatewayDomain
<LocalizedCategory("strCategoryGateway", 5), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameRDGatewayDomainInherit"), _
@@ -2069,9 +2076,9 @@ Namespace Connection
End Set
End Property
#End Region
#Region "VNC"
#Region "9 VNC"
Private _VNCCompression As Boolean = My.Settings.InhDefaultVNCCompression
<LocalizedCategory("strCategoryAppearance", 6), _
<LocalizedCategory("strCategoryAppearance", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritCompression"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2085,7 +2092,7 @@ Namespace Connection
End Property
Private _VNCEncoding As Boolean = My.Settings.InhDefaultVNCEncoding
<LocalizedCategory("strCategoryAppearance", 6), _
<LocalizedCategory("strCategoryAppearance", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritEncoding"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2099,7 +2106,7 @@ Namespace Connection
End Property
Private _VNCAuthMode As Boolean = My.Settings.InhDefaultVNCAuthMode
<LocalizedCategory("strCategoryConnection", 3), _
<LocalizedCategory("strCategoryConnection", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritAuthenticationMode"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2113,7 +2120,7 @@ Namespace Connection
End Property
Private _VNCProxyType As Boolean = My.Settings.InhDefaultVNCProxyType
<LocalizedCategory("strCategoryMiscellaneous", 8), _
<LocalizedCategory("strCategoryMiscellaneous", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritVNCProxyType"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2127,7 +2134,7 @@ Namespace Connection
End Property
Private _VNCProxyIP As Boolean = My.Settings.InhDefaultVNCProxyIP
<LocalizedCategory("strCategoryMiscellaneous", 8), _
<LocalizedCategory("strCategoryMiscellaneous", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritVNCProxyAddress"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2141,7 +2148,7 @@ Namespace Connection
End Property
Private _VNCProxyPort As Boolean = My.Settings.InhDefaultVNCProxyPort
<LocalizedCategory("strCategoryMiscellaneous", 8), _
<LocalizedCategory("strCategoryMiscellaneous", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritVNCProxyPort"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2155,7 +2162,7 @@ Namespace Connection
End Property
Private _VNCProxyUsername As Boolean = My.Settings.InhDefaultVNCProxyUsername
<LocalizedCategory("strCategoryMiscellaneous", 8), _
<LocalizedCategory("strCategoryMiscellaneous", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritVNCProxyUsername"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2169,7 +2176,7 @@ Namespace Connection
End Property
Private _VNCProxyPassword As Boolean = My.Settings.InhDefaultVNCProxyPassword
<LocalizedCategory("strCategoryMiscellaneous", 8), _
<LocalizedCategory("strCategoryMiscellaneous", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritVNCProxyPassword"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2183,7 +2190,7 @@ Namespace Connection
End Property
Private _VNCColors As Boolean = My.Settings.InhDefaultVNCColors
<LocalizedCategory("strCategoryAppearance", 6), _
<LocalizedCategory("strCategoryAppearance", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritColors"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2197,7 +2204,7 @@ Namespace Connection
End Property
Private _VNCSmartSizeMode As Boolean = My.Settings.InhDefaultVNCSmartSizeMode
<LocalizedCategory("strCategoryAppearance", 6), _
<LocalizedCategory("strCategoryAppearance", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritSmartSizeMode"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2211,7 +2218,7 @@ Namespace Connection
End Property
Private _VNCViewOnly As Boolean = My.Settings.InhDefaultVNCViewOnly
<LocalizedCategory("strCategoryAppearance", 6), _
<LocalizedCategory("strCategoryAppearance", 9), _
Browsable(True), _
LocalizedDisplayName("strPropertyNameInheritViewOnly"), _
TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
@@ -2226,6 +2233,7 @@ Namespace Connection
#End Region
End Class
#End Region
<Flags()> _
Public Enum Force

View File

@@ -16,27 +16,27 @@
<p>
<span class="heading1">Steps to configure your SQL Server</span></p>
<ul>
<li>Create a new Database called &quot;mRemote&quot; on your SQL Server.</li>
<li>Create a new Database called &quot;mRemoteNG&quot; on your SQL Server.</li>
<li>Run the SQL Script below on the newly created Database.</li>
<li>Give the users that you want to grant access to the mRemote Connections Database
Read/Write permissions on the Database.</li>
</ul>
<p class="heading1">
Steps to configure mRemote for SQL</p>
Steps to configure mRemoteNG for SQL</p>
<ul>
<li>Start mRemote if it&#39;s not already running.</li>
<li>Start mRemoteNG if it&#39;s not already running.</li>
<li>Go to Options - Connections.</li>
<li>Check the box that says &quot;Use SQL Server to load &amp; save connections&quot;.</li>
<li>Fill in your SQL Server hostname or ip address.</li>
<li>If you do not use your Windows logon info to authenticate against the SQL Server
fill in the correct Username and Password.</li>
<li>Click OK to apply the changes. The main window title should now change to
&quot;mRemote | SQL Server&quot;.</li>
&quot;mRemoteNG | SQL Server&quot;.</li>
<li>Now click on File - Save to update the tables on your SQL Server with the data
from the loaded connections xml file. (Do not click File - New, this doesn&#39;t
work yet)</li>
<li>You should now be able to do everything you were able to do with the XML storage
plus see the changes live on another mRemote instance that is connected to the
plus see the changes live on another mRemoteNG instance that is connected to the
same Database.</li>
</ul>

View File

@@ -2045,4 +2045,37 @@ Fehler Beschreibung: {1}</value>
<data name="strQuick" xml:space="preserve">
<value>Direkt: {0}</value>
</data>
<data name="strSessionKillFailed" xml:space="preserve">
<value>Beenden der Sitzung im Hintergrund fehlgeschlagen!</value>
</data>
<data name="strSessionGetFailed" xml:space="preserve">
<value>Holen der Sitzung im Hintergrund fehlgeschlagen!</value>
</data>
<data name="strConfigPropertyGridObjectFailed" xml:space="preserve">
<value>Eigenschaften Grid Objekt Fehler!</value>
</data>
<data name="strConfigUiLoadFailed" xml:space="preserve">
<value>Konfigurationsfenster laden fehlgeschlagen!</value>
</data>
<data name="strConfigPropertyGridValueFailed" xml:space="preserve">
<value>Eigenschaften Grid Wert Fehler!</value>
</data>
<data name="strConfigPropertyGridHideItemsFailed" xml:space="preserve">
<value>Verstecken nicht benötigter Eigenschaften fehlgeschlagen!</value>
</data>
<data name="strConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
<value>Bild Knopf Ereignis fehlgeschlagen!</value>
</data>
<data name="strConfigPropertyGridMenuClickFailed" xml:space="preserve">
<value>Menü Ereignis fehlgeschlagen!</value>
</data>
<data name="strConfigPropertyGridSetHostStatusFailed" xml:space="preserve">
<value>Host Status setzen fehlgeschlagen!</value>
</data>
<data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
<value>Setzen der Standard Verbindungsdaten fehlgeschlagen!</value>
</data>
<data name="strPropertyNameRDGatewayDomainInherit" xml:space="preserve">
<value>Vererbe Gateway Domäne</value>
</data>
</root>

View File

@@ -1571,6 +1571,69 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die btnIcon_Click failed! ähnelt.
'''</summary>
Friend ReadOnly Property strConfigPropertyGridButtonIconClickFailed() As String
Get
Return ResourceManager.GetString("strConfigPropertyGridButtonIconClickFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die ShowHideGridItems failed! ähnelt.
'''</summary>
Friend ReadOnly Property strConfigPropertyGridHideItemsFailed() As String
Get
Return ResourceManager.GetString("strConfigPropertyGridHideItemsFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die IconMenu_Click failed! ähnelt.
'''</summary>
Friend ReadOnly Property strConfigPropertyGridMenuClickFailed() As String
Get
Return ResourceManager.GetString("strConfigPropertyGridMenuClickFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Property Grid object failed! ähnelt.
'''</summary>
Friend ReadOnly Property strConfigPropertyGridObjectFailed() As String
Get
Return ResourceManager.GetString("strConfigPropertyGridObjectFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die SetHostStatus failed! ähnelt.
'''</summary>
Friend ReadOnly Property strConfigPropertyGridSetHostStatusFailed() As String
Get
Return ResourceManager.GetString("strConfigPropertyGridSetHostStatusFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die pGrid_PopertyValueChanged failed! ähnelt.
'''</summary>
Friend ReadOnly Property strConfigPropertyGridValueFailed() As String
Get
Return ResourceManager.GetString("strConfigPropertyGridValueFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Config UI load failed! ähnelt.
'''</summary>
Friend ReadOnly Property strConfigUiLoadFailed() As String
Get
Return ResourceManager.GetString("strConfigUiLoadFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Are you sure you want to delete the external tool, &quot;{0}&quot;? ähnelt.
'''</summary>
@@ -1744,6 +1807,15 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Couldn&apos;t set default port! ähnelt.
'''</summary>
Friend ReadOnly Property strConnectionSetDefaultPortFailed() As String
Get
Return ResourceManager.GetString("strConnectionSetDefaultPortFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Couldn&apos;t create backup of connections file! ähnelt.
'''</summary>
@@ -4599,6 +4671,15 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Inherit Gateway Domain ähnelt.
'''</summary>
Friend ReadOnly Property strPropertyNameRDGatewayDomainInherit() As String
Get
Return ResourceManager.GetString("strPropertyNameRDGatewayDomainInherit", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Gateway Hostname ähnelt.
'''</summary>
@@ -5682,6 +5763,24 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Get Sessions Background failed ähnelt.
'''</summary>
Friend ReadOnly Property strSessionGetFailed() As String
Get
Return ResourceManager.GetString("strSessionGetFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Kill Session Background failed ähnelt.
'''</summary>
Friend ReadOnly Property strSessionKillFailed() As String
Get
Return ResourceManager.GetString("strSessionKillFailed", resourceCulture)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Set hostname like display name when creating new connections ähnelt.
'''</summary>

View File

@@ -2358,4 +2358,37 @@ Error Description: {1}</value>
<data name="strQuick" xml:space="preserve">
<value>Quick: {0}</value>
</data>
<data name="strSessionKillFailed" xml:space="preserve">
<value>Kill Session Background failed</value>
</data>
<data name="strSessionGetFailed" xml:space="preserve">
<value>Get Sessions Background failed</value>
</data>
<data name="strConfigPropertyGridObjectFailed" xml:space="preserve">
<value>Property Grid object failed!</value>
</data>
<data name="strConfigUiLoadFailed" xml:space="preserve">
<value>Config UI load failed!</value>
</data>
<data name="strConfigPropertyGridValueFailed" xml:space="preserve">
<value>pGrid_PopertyValueChanged failed!</value>
</data>
<data name="strConfigPropertyGridHideItemsFailed" xml:space="preserve">
<value>ShowHideGridItems failed!</value>
</data>
<data name="strConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
<value>btnIcon_Click failed!</value>
</data>
<data name="strConfigPropertyGridMenuClickFailed" xml:space="preserve">
<value>IconMenu_Click failed!</value>
</data>
<data name="strConfigPropertyGridSetHostStatusFailed" xml:space="preserve">
<value>SetHostStatus failed!</value>
</data>
<data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
<value>Couldn't set default port!</value>
</data>
<data name="strPropertyNameRDGatewayDomainInherit" xml:space="preserve">
<value>Inherit Gateway Domain</value>
</data>
</root>

View File

@@ -547,19 +547,6 @@ Namespace My
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("mRemote")> _
Public Property ConDefaultIcon() As String
Get
Return CType(Me("ConDefaultIcon"),String)
End Get
Set
Me("ConDefaultIcon") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
@@ -1993,6 +1980,91 @@ Namespace My
Return CType(Me("ConDefaultRDGatewayUseConnectionCredentials"),String)
End Get
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("mRemoteNG")> _
Public Property ConDefaultIcon() As String
Get
Return CType(Me("ConDefaultIcon"),String)
End Get
Set
Me("ConDefaultIcon") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property InhDefaultRDGatewayUsageMethod() As Boolean
Get
Return CType(Me("InhDefaultRDGatewayUsageMethod"),Boolean)
End Get
Set
Me("InhDefaultRDGatewayUsageMethod") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property InhDefaultRDGatewayHostname() As Boolean
Get
Return CType(Me("InhDefaultRDGatewayHostname"),Boolean)
End Get
Set
Me("InhDefaultRDGatewayHostname") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property InhDefaultRDGatewayUsername() As Boolean
Get
Return CType(Me("InhDefaultRDGatewayUsername"),Boolean)
End Get
Set
Me("InhDefaultRDGatewayUsername") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property InhDefaultRDGatewayPassword() As Boolean
Get
Return CType(Me("InhDefaultRDGatewayPassword"),Boolean)
End Get
Set
Me("InhDefaultRDGatewayPassword") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property InhDefaultRDGatewayDomain() As Boolean
Get
Return CType(Me("InhDefaultRDGatewayDomain"),Boolean)
End Get
Set
Me("InhDefaultRDGatewayDomain") = value
End Set
End Property
<Global.System.Configuration.UserScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("False")> _
Public Property InhDefaultRDGatewayUseConnectionCredentials() As Boolean
Get
Return CType(Me("InhDefaultRDGatewayUseConnectionCredentials"),Boolean)
End Get
Set
Me("InhDefaultRDGatewayUseConnectionCredentials") = value
End Set
End Property
End Class
End Namespace

View File

@@ -116,9 +116,6 @@
<Setting Name="ConDefaultDescription" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ConDefaultIcon" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
<Value Profile="(Default)">mRemote</Value>
</Setting>
<Setting Name="ConDefaultPanel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
<Value Profile="(Default)">General</Value>
</Setting>
@@ -452,5 +449,26 @@
<Setting Name="ConDefaultRDGatewayUseConnectionCredentials" Type="System.String" Scope="Application">
<Value Profile="(Default)">Yes</Value>
</Setting>
<Setting Name="ConDefaultIcon" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
<Value Profile="(Default)">mRemoteNG</Value>
</Setting>
<Setting Name="InhDefaultRDGatewayUsageMethod" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="InhDefaultRDGatewayHostname" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="InhDefaultRDGatewayUsername" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="InhDefaultRDGatewayPassword" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="InhDefaultRDGatewayDomain" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="InhDefaultRDGatewayUseConnectionCredentials" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>

View File

@@ -10,7 +10,7 @@ Namespace Root
End Sub
#Region "Properties"
Private _Name As String = "Connections"
Private _Name As String = My.Resources.strConnections
<LocalizedCategory("strCategoryDisplay", 1), _
Browsable(True), _
[ReadOnly](False), _

View File

@@ -382,7 +382,7 @@ Namespace UI
Me.ShowHideGridItems()
Me.SetHostStatus(Obj)
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "SetPropertyGridObject (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridObjectFailed & vbNewLine & ex.Message, True)
End Try
End Sub
@@ -423,7 +423,7 @@ Namespace UI
tsDefault.Items(tsDefault.Items.Count - 1).Visible = False
ToolStripManager.Merge(tsCustom, tsDefault)
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "Load (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigUiLoadFailed & vbNewLine & ex.Message, True)
End Try
End Sub
@@ -490,237 +490,604 @@ Namespace UI
Me.ShowHideGridItems()
App.Runtime.SaveConnectionsBG()
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "pGrid_PopertyValueChanged (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridValueFailed & vbNewLine & ex.Message, True)
End Try
End Sub
Private Sub ShowHideGridItems()
Try
Dim strHide As String = ""
Dim strHide As List(Of String) = New List(Of String)
If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then
Dim conI As mRemoteNG.Connection.Info = pGrid.SelectedObject
Select Case conI.Protocol
Case mRemoteNG.Connection.Protocol.Protocols.RDP
strHide &= "ExtApp;RenderingEngine;PuttySession;ICAEncryption;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;"
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("PuttySession")
strHide.Add("RenderingEngine")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
If conI.RDGatewayUsageMethod = mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod.Never Then
strHide &= "RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
ElseIf conI.RDGatewayUseConnectionCredentials Then
strHide &= "RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsername")
End If
Case mRemoteNG.Connection.Protocol.Protocols.VNC
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("PuttySession")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
If conI.VNCAuthMode = mRemoteNG.Connection.Protocol.VNC.AuthMode.AuthVNC Then
strHide &= "Username;Domain;"
strHide.Add("Username;Domain")
End If
If conI.VNCProxyType = mRemoteNG.Connection.Protocol.VNC.ProxyType.ProxyNone Then
strHide &= "VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyUsername;"
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyUsername")
End If
Case mRemoteNG.Connection.Protocol.Protocols.SSH1
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.SSH2
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.Telnet
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("Password")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("Username")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.Rlogin
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("Password")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("Username")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.RAW
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;Password;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;Username;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("Password")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("Username")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.HTTP
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("PuttySession")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.HTTPS
strHide &= "ExtApp;CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;ICAEncryption;RDPAuthenticationLevel;PuttySession;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ExtApp")
strHide.Add("ICAEncryption")
strHide.Add("PuttySession")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound;Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.ICA
strHide &= "ExtApp;DisplayThemes;DisplayWallpaper;PuttySession;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;UseConsoleSession;RenderingEngine;Port;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("ExtApp")
strHide.Add("Port")
strHide.Add("PuttySession")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("UseConsoleSession")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
Case mRemoteNG.Connection.Protocol.Protocols.IntApp
strHide &= "CacheBitmaps;Colors;DisplayThemes;DisplayWallpaper;Domain;PuttySession;ICAEncryption;RDPAuthenticationLevel;RedirectDiskDrives;RedirectKeys;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;Resolution;UseConsoleSession;RenderingEngine;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
strHide.Add("CacheBitmaps")
strHide.Add("Colors")
strHide.Add("DisplayThemes")
strHide.Add("DisplayWallpaper")
strHide.Add("Domain")
strHide.Add("ICAEncryption")
strHide.Add("PuttySession")
strHide.Add("RDGatewayDomain")
strHide.Add("RDGatewayHostname")
strHide.Add("RDGatewayPassword")
strHide.Add("RDGatewayUsageMethod")
strHide.Add("RDGatewayUseConnectionCredentials")
strHide.Add("RDGatewayUsername")
strHide.Add("RDPAuthenticationLevel")
strHide.Add("RedirectDiskDrives")
strHide.Add("RedirectKeys")
strHide.Add("RedirectPorts")
strHide.Add("RedirectPrinters")
strHide.Add("RedirectSmartCards")
strHide.Add("RedirectSound")
strHide.Add("RenderingEngine")
strHide.Add("Resolution")
strHide.Add("UseConsoleSession")
strHide.Add("VNCAuthMode")
strHide.Add("VNCColors")
strHide.Add("VNCCompression")
strHide.Add("VNCEncoding")
strHide.Add("VNCProxyIP")
strHide.Add("VNCProxyPassword")
strHide.Add("VNCProxyPort")
strHide.Add("VNCProxyType")
strHide.Add("VNCProxyUsername")
strHide.Add("VNCSmartSizeMode")
strHide.Add("VNCViewOnly")
End Select
If conI.IsDefault = False Then
With conI.Inherit
If .CacheBitmaps Then
strHide &= "CacheBitmaps;"
strHide.Add("CacheBitmaps")
End If
If .Colors Then
strHide &= "Colors;"
strHide.Add("Colors")
End If
If .Description Then
strHide &= "Description;"
strHide.Add("Description")
End If
If .DisplayThemes Then
strHide &= "DisplayThemes;"
strHide.Add("DisplayThemes")
End If
If .DisplayWallpaper Then
strHide &= "DisplayWallpaper;"
strHide.Add("DisplayWallpaper")
End If
If .Domain Then
strHide &= "Domain;"
strHide.Add("Domain")
End If
If .Icon Then
strHide &= "Icon;"
strHide.Add("Icon")
End If
If .Password Then
strHide &= "Password;"
strHide.Add("Password")
End If
If .Port Then
strHide &= "Port;"
strHide.Add("Port")
End If
If .Protocol Then
strHide &= "Protocol;"
strHide.Add("Protocol")
End If
If .PuttySession Then
strHide &= "PuttySession;"
strHide.Add("PuttySession")
End If
If .RedirectDiskDrives Then
strHide &= "RedirectDiskDrives;"
strHide.Add("RedirectDiskDrives")
End If
If .RedirectKeys Then
strHide &= "RedirectKeys;"
strHide.Add("RedirectKeys")
End If
If .RedirectPorts Then
strHide &= "RedirectPorts;"
strHide.Add("RedirectPorts")
End If
If .RedirectPrinters Then
strHide &= "RedirectPrinters;"
strHide.Add("RedirectPrinters")
End If
If .RedirectSmartCards Then
strHide &= "RedirectSmartCards;"
strHide.Add("RedirectSmartCards")
End If
If .RedirectSound Then
strHide &= "RedirectSound;"
strHide.Add("RedirectSound")
End If
If .Resolution Then
strHide &= "Resolution;"
strHide.Add("Resolution")
End If
If .UseConsoleSession Then
strHide &= "UseConsoleSession;"
strHide.Add("UseConsoleSession")
End If
If .RenderingEngine Then
strHide &= "RenderingEngine;"
strHide.Add("RenderingEngine")
End If
If .ICAEncryption Then
strHide &= "ICAEncryption;"
strHide.Add("ICAEncryption")
End If
If .RDPAuthenticationLevel Then
strHide &= "RDPAuthenticationLevel;"
strHide.Add("RDPAuthenticationLevel")
End If
If .Username Then
strHide &= "Username;"
strHide.Add("Username")
End If
If .Panel Then
strHide &= "Panel;"
strHide.Add("Panel")
End If
If conI.IsContainer Then
strHide &= "Hostname;"
strHide.Add("Hostname")
End If
If .PreExtApp Then
strHide &= "PreExtApp;"
strHide.Add("PreExtApp")
End If
If .PostExtApp Then
strHide &= "PostExtApp;"
strHide.Add("PostExtApp")
End If
If .MacAddress Then
strHide &= "MacAddress;"
strHide.Add("MacAddress")
End If
If .UserField Then
strHide &= "UserField;"
strHide.Add("UserField")
End If
If .VNCAuthMode Then
strHide &= "VNCAuthMode;"
strHide.Add("VNCAuthMode")
End If
If .VNCColors Then
strHide &= "VNCColors;"
strHide.Add("VNCColors")
End If
If .VNCCompression Then
strHide &= "VNCCompression;"
strHide.Add("VNCCompression")
End If
If .VNCEncoding Then
strHide &= "VNCEncoding;"
strHide.Add("VNCEncoding")
End If
If .VNCProxyIP Then
strHide &= "VNCProxyIP;"
strHide.Add("VNCProxyIP")
End If
If .VNCProxyPassword Then
strHide &= "VNCProxyPassword;"
strHide.Add("VNCProxyPassword")
End If
If .VNCProxyPort Then
strHide &= "VNCProxyPort;"
strHide.Add("VNCProxyPort")
End If
If .VNCProxyType Then
strHide &= "VNCProxyType;"
strHide.Add("VNCProxyType")
End If
If .VNCProxyUsername Then
strHide &= "VNCProxyUsername;"
strHide.Add("VNCProxyUsername")
End If
If .VNCViewOnly Then
strHide &= "VNCViewOnly;"
strHide.Add("VNCViewOnly")
End If
If .VNCSmartSizeMode Then
strHide &= "VNCSmartSizeMode;"
strHide.Add("VNCSmartSizeMode")
End If
If .ExtApp Then
strHide &= "ExtApp"
strHide.Add("ExtApp")
End If
If .RDGatewayUsageMethod Then
strHide.Add("RDGatewayUsageMethod")
End If
If .RDGatewayHostname Then
strHide &= "RDGatewayHostname"
strHide.Add("RDGatewayHostname")
End If
If .RDGatewayUsername Then
strHide.Add("RDGatewayUsername")
End If
If .RDGatewayPassword Then
strHide.Add("RDGatewayPassword")
End If
If .RDGatewayDomain Then
strHide.Add("RDGatewayDomain")
End If
If .RDGatewayUseConnectionCredentials Then
strHide.Add("RDGatewayUseConnectionCredentials")
End If
If .RDGatewayHostname Then
strHide.Add("RDGatewayHostname")
End If
End With
Else
strHide = "Hostname;Name;"
strHide.Add("Hostname")
strHide.Add("Name")
End If
ElseIf TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Root.Info Then
strHide &= "TreeNode;"
Else
strHide = ";"
strHide.Add("TreeNode")
End If
Me.pGrid.HiddenProperties = strHide.Split(";")
Me.pGrid.HiddenProperties = strHide.ToArray
Me.pGrid.Refresh()
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideGridItems (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridHideItemsFailed & vbNewLine & ex.Message, True)
End Try
End Sub
@@ -802,7 +1169,7 @@ Namespace UI
Me.cMenIcons.Show(mPos)
End If
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "btnIcon_Click (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridButtonIconClickFailed & vbNewLine & ex.Message, True)
End Try
End Sub
@@ -818,7 +1185,7 @@ Namespace UI
App.Runtime.SaveConnectionsBG()
End If
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "IconMenu_Click (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridMenuClickFailed & vbNewLine & ex.Message, True)
End Try
End Sub
#End Region
@@ -884,7 +1251,7 @@ Namespace UI
pThread.IsBackground = True
pThread.Start()
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "SetHostStatus (UI.Window.Config) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridSetHostStatusFailed & vbNewLine & ex.Message, True)
End Try
End Sub
#End Region

View File

@@ -178,7 +178,7 @@ Namespace UI
sU = Nothing
tS.CloseConnection(tServerHandle)
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessionsBG (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionGetFailed & vbNewLine & ex.Message, True)
End Try
End Sub
@@ -214,7 +214,7 @@ Namespace UI
GetSessionsBG()
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, "KillSessionBG (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True)
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionKillFailed & vbNewLine & ex.Message, True)
End Try
End Sub

View File

@@ -173,9 +173,6 @@
<setting name="ConDefaultDescription" serializeAs="String">
<value />
</setting>
<setting name="ConDefaultIcon" serializeAs="String">
<value>mRemoteNG</value>
</setting>
<setting name="ConDefaultPanel" serializeAs="String">
<value>General</value>
</setting>
@@ -503,6 +500,27 @@
<setting name="UpdatePending" serializeAs="String">
<value>False</value>
</setting>
<setting name="ConDefaultIcon" serializeAs="String">
<value>mRemoteNG</value>
</setting>
<setting name="InhDefaultRDGatewayUsageMethod" serializeAs="String">
<value>False</value>
</setting>
<setting name="InhDefaultRDGatewayHostname" serializeAs="String">
<value>False</value>
</setting>
<setting name="InhDefaultRDGatewayUsername" serializeAs="String">
<value>False</value>
</setting>
<setting name="InhDefaultRDGatewayPassword" serializeAs="String">
<value>False</value>
</setting>
<setting name="InhDefaultRDGatewayDomain" serializeAs="String">
<value>False</value>
</setting>
<setting name="InhDefaultRDGatewayUseConnectionCredentials" serializeAs="String">
<value>False</value>
</setting>
</mRemoteNG.My.MySettings>
</userSettings>
<applicationSettings>