diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index e374c0faf..d52f52bcd 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -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 diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb index 75cbb2e57..352a26443 100644 --- a/mRemoteV1/Config/Config.Connections.Load.vb +++ b/mRemoteV1/Config/Config.Connections.Load.vb @@ -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 diff --git a/mRemoteV1/Connection/Connection.Info.vb b/mRemoteV1/Connection/Connection.Info.vb index bee162870..a4fa4d9ee 100644 --- a/mRemoteV1/Connection/Connection.Info.vb +++ b/mRemoteV1/Connection/Connection.Info.vb @@ -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 _ @@ -1299,7 +1298,6 @@ Namespace Connection End Set End Property - Private _IsContainer As Boolean = 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" _ @@ -2085,7 +2092,7 @@ Namespace Connection End Property Private _VNCEncoding As Boolean = My.Settings.InhDefaultVNCEncoding - _ @@ -2099,7 +2106,7 @@ Namespace Connection End Property Private _VNCAuthMode As Boolean = My.Settings.InhDefaultVNCAuthMode - _ @@ -2113,7 +2120,7 @@ Namespace Connection End Property Private _VNCProxyType As Boolean = My.Settings.InhDefaultVNCProxyType - _ @@ -2127,7 +2134,7 @@ Namespace Connection End Property Private _VNCProxyIP As Boolean = My.Settings.InhDefaultVNCProxyIP - _ @@ -2141,7 +2148,7 @@ Namespace Connection End Property Private _VNCProxyPort As Boolean = My.Settings.InhDefaultVNCProxyPort - _ @@ -2155,7 +2162,7 @@ Namespace Connection End Property Private _VNCProxyUsername As Boolean = My.Settings.InhDefaultVNCProxyUsername - _ @@ -2169,7 +2176,7 @@ Namespace Connection End Property Private _VNCProxyPassword As Boolean = My.Settings.InhDefaultVNCProxyPassword - _ @@ -2183,7 +2190,7 @@ Namespace Connection End Property Private _VNCColors As Boolean = My.Settings.InhDefaultVNCColors - _ @@ -2197,7 +2204,7 @@ Namespace Connection End Property Private _VNCSmartSizeMode As Boolean = My.Settings.InhDefaultVNCSmartSizeMode - _ @@ -2211,7 +2218,7 @@ Namespace Connection End Property Private _VNCViewOnly As Boolean = My.Settings.InhDefaultVNCViewOnly - _ @@ -2226,6 +2233,7 @@ Namespace Connection #End Region End Class +#End Region _ Public Enum Force diff --git a/mRemoteV1/Help/ConfigurationSQL.htm b/mRemoteV1/Help/ConfigurationSQL.htm index 537d9e58a..419ec236f 100644 --- a/mRemoteV1/Help/ConfigurationSQL.htm +++ b/mRemoteV1/Help/ConfigurationSQL.htm @@ -16,27 +16,27 @@

Steps to configure your SQL Server

    -
  • Create a new Database called "mRemote" on your SQL Server.
    • +
  • Create a new Database called "mRemoteNG" on your SQL Server.
  • Run the SQL Script below on the newly created Database.
  • Give the users that you want to grant access to the mRemote Connections Database Read/Write permissions on the Database.

- Steps to configure mRemote for SQL

+ Steps to configure mRemoteNG for SQL

    -
  • Start mRemote if it's not already running.
    • +
  • Start mRemoteNG if it's not already running.
  • Go to Options - Connections.
  • Check the box that says "Use SQL Server to load & save connections".
  • Fill in your SQL Server hostname or ip address.
  • If you do not use your Windows logon info to authenticate against the SQL Server fill in the correct Username and Password.
  • Click OK to apply the changes. The main window title should now change to - "mRemote | SQL Server".
    • + "mRemoteNG | SQL Server".
  • 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't work yet)
  • 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.
diff --git a/mRemoteV1/Language/Resources.de.resx b/mRemoteV1/Language/Resources.de.resx index e557cf6ea..91654c8b6 100644 --- a/mRemoteV1/Language/Resources.de.resx +++ b/mRemoteV1/Language/Resources.de.resx @@ -2045,4 +2045,37 @@ Fehler Beschreibung: {1} Direkt: {0} + + Beenden der Sitzung im Hintergrund fehlgeschlagen! + + + Holen der Sitzung im Hintergrund fehlgeschlagen! + + + Eigenschaften Grid Objekt Fehler! + + + Konfigurationsfenster laden fehlgeschlagen! + + + Eigenschaften Grid Wert Fehler! + + + Verstecken nicht benötigter Eigenschaften fehlgeschlagen! + + + Bild Knopf Ereignis fehlgeschlagen! + + + Menü Ereignis fehlgeschlagen! + + + Host Status setzen fehlgeschlagen! + + + Setzen der Standard Verbindungsdaten fehlgeschlagen! + + + Vererbe Gateway Domäne + \ No newline at end of file diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index 6a360eed2..0a3ebce65 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -1571,6 +1571,69 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die btnIcon_Click failed! ähnelt. + ''' + Friend ReadOnly Property strConfigPropertyGridButtonIconClickFailed() As String + Get + Return ResourceManager.GetString("strConfigPropertyGridButtonIconClickFailed", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ShowHideGridItems failed! ähnelt. + ''' + Friend ReadOnly Property strConfigPropertyGridHideItemsFailed() As String + Get + Return ResourceManager.GetString("strConfigPropertyGridHideItemsFailed", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die IconMenu_Click failed! ähnelt. + ''' + Friend ReadOnly Property strConfigPropertyGridMenuClickFailed() As String + Get + Return ResourceManager.GetString("strConfigPropertyGridMenuClickFailed", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Property Grid object failed! ähnelt. + ''' + Friend ReadOnly Property strConfigPropertyGridObjectFailed() As String + Get + Return ResourceManager.GetString("strConfigPropertyGridObjectFailed", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die SetHostStatus failed! ähnelt. + ''' + Friend ReadOnly Property strConfigPropertyGridSetHostStatusFailed() As String + Get + Return ResourceManager.GetString("strConfigPropertyGridSetHostStatusFailed", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die pGrid_PopertyValueChanged failed! ähnelt. + ''' + Friend ReadOnly Property strConfigPropertyGridValueFailed() As String + Get + Return ResourceManager.GetString("strConfigPropertyGridValueFailed", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Config UI load failed! ähnelt. + ''' + Friend ReadOnly Property strConfigUiLoadFailed() As String + Get + Return ResourceManager.GetString("strConfigUiLoadFailed", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Are you sure you want to delete the external tool, "{0}"? ähnelt. ''' @@ -1744,6 +1807,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Couldn't set default port! ähnelt. + ''' + Friend ReadOnly Property strConnectionSetDefaultPortFailed() As String + Get + Return ResourceManager.GetString("strConnectionSetDefaultPortFailed", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Couldn't create backup of connections file! ähnelt. ''' @@ -4599,6 +4671,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Inherit Gateway Domain ähnelt. + ''' + Friend ReadOnly Property strPropertyNameRDGatewayDomainInherit() As String + Get + Return ResourceManager.GetString("strPropertyNameRDGatewayDomainInherit", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Gateway Hostname ähnelt. ''' @@ -5682,6 +5763,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Get Sessions Background failed ähnelt. + ''' + Friend ReadOnly Property strSessionGetFailed() As String + Get + Return ResourceManager.GetString("strSessionGetFailed", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Kill Session Background failed ähnelt. + ''' + Friend ReadOnly Property strSessionKillFailed() As String + Get + Return ResourceManager.GetString("strSessionKillFailed", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Set hostname like display name when creating new connections ähnelt. ''' diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index d25962de4..b14974989 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -2358,4 +2358,37 @@ Error Description: {1} Quick: {0} + + Kill Session Background failed + + + Get Sessions Background failed + + + Property Grid object failed! + + + Config UI load failed! + + + pGrid_PopertyValueChanged failed! + + + ShowHideGridItems failed! + + + btnIcon_Click failed! + + + IconMenu_Click failed! + + + SetHostStatus failed! + + + Couldn't set default port! + + + Inherit Gateway Domain + \ No newline at end of file diff --git a/mRemoteV1/My Project/Settings.Designer.vb b/mRemoteV1/My Project/Settings.Designer.vb index 31e41628c..112a35287 100644 --- a/mRemoteV1/My Project/Settings.Designer.vb +++ b/mRemoteV1/My Project/Settings.Designer.vb @@ -547,19 +547,6 @@ Namespace My End Set End Property - _ - Public Property ConDefaultIcon() As String - Get - Return CType(Me("ConDefaultIcon"),String) - End Get - Set - Me("ConDefaultIcon") = value - End Set - End Property - _ + Public Property ConDefaultIcon() As String + Get + Return CType(Me("ConDefaultIcon"),String) + End Get + Set + Me("ConDefaultIcon") = value + End Set + End Property + + _ + Public Property InhDefaultRDGatewayUsageMethod() As Boolean + Get + Return CType(Me("InhDefaultRDGatewayUsageMethod"),Boolean) + End Get + Set + Me("InhDefaultRDGatewayUsageMethod") = value + End Set + End Property + + _ + Public Property InhDefaultRDGatewayHostname() As Boolean + Get + Return CType(Me("InhDefaultRDGatewayHostname"),Boolean) + End Get + Set + Me("InhDefaultRDGatewayHostname") = value + End Set + End Property + + _ + Public Property InhDefaultRDGatewayUsername() As Boolean + Get + Return CType(Me("InhDefaultRDGatewayUsername"),Boolean) + End Get + Set + Me("InhDefaultRDGatewayUsername") = value + End Set + End Property + + _ + Public Property InhDefaultRDGatewayPassword() As Boolean + Get + Return CType(Me("InhDefaultRDGatewayPassword"),Boolean) + End Get + Set + Me("InhDefaultRDGatewayPassword") = value + End Set + End Property + + _ + Public Property InhDefaultRDGatewayDomain() As Boolean + Get + Return CType(Me("InhDefaultRDGatewayDomain"),Boolean) + End Get + Set + Me("InhDefaultRDGatewayDomain") = value + End Set + End Property + + _ + 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 diff --git a/mRemoteV1/My Project/Settings.settings b/mRemoteV1/My Project/Settings.settings index a7d568d2a..e1e5238ad 100644 --- a/mRemoteV1/My Project/Settings.settings +++ b/mRemoteV1/My Project/Settings.settings @@ -116,9 +116,6 @@ - - mRemote - General @@ -452,5 +449,26 @@ Yes + + mRemoteNG + + + False + + + False + + + False + + + False + + + False + + + False + \ No newline at end of file diff --git a/mRemoteV1/Root/Root.Info.vb b/mRemoteV1/Root/Root.Info.vb index 0bdb75ceb..ebe8083dd 100644 --- a/mRemoteV1/Root/Root.Info.vb +++ b/mRemoteV1/Root/Root.Info.vb @@ -10,7 +10,7 @@ Namespace Root End Sub #Region "Properties" - Private _Name As String = "Connections" + Private _Name As String = My.Resources.strConnections - - mRemoteNG - General @@ -503,6 +500,27 @@ False + + mRemoteNG + + + False + + + False + + + False + + + False + + + False + + + False +