diff --git a/.gitignore b/.gitignore index f07583ce..7f5bfe19 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,14 @@ mRemoteV1/publish *.suo *.vbproj.user Thumbs.db -_ReSharper.* +[Dd]ebug/ +_Re[Ss]harper.* +*.resharper *.resharper.user +*.suo +*.cache +*~ +*.swp +*.user* +*.pidb +*.gpState diff --git a/mRemoteV1.sln b/mRemoteV1.sln index 5cf6d34f..6cae3dda 100644 --- a/mRemoteV1.sln +++ b/mRemoteV1.sln @@ -15,8 +15,8 @@ Global {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU - {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/mRemoteV1/App/App.Announcement.vb b/mRemoteV1/App/App.Announcement.vb index 5cf3c5a4..374f4fb7 100644 --- a/mRemoteV1/App/App.Announcement.vb +++ b/mRemoteV1/App/App.Announcement.vb @@ -1,6 +1,5 @@ -Imports System.IO -Imports System.Net -Imports mRemote.App.Runtime +Imports System.Net +Imports mRemoteNG.App.Runtime Namespace App Public Class Announcement diff --git a/mRemoteV1/App/App.Editions.vb b/mRemoteV1/App/App.Editions.vb index 9326add4..b57bd385 100644 --- a/mRemoteV1/App/App.Editions.vb +++ b/mRemoteV1/App/App.Editions.vb @@ -1,6 +1,4 @@ -Imports System.IO - -Namespace App +Namespace App Namespace Editions Public Class Spanlink Public Shared Enabled As Boolean = True diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index 622aa970..4192132e 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -33,13 +33,12 @@ Namespace App Public Shared LastSelected As String - Public Shared DefaultConnection As mRemote.Connection.Info - Public Shared DefaultInheritance As mRemote.Connection.Info.Inheritance + Public Shared DefaultConnection As mRemoteNG.Connection.Info + Public Shared DefaultInheritance As mRemoteNG.Connection.Info.Inheritance Public Shared ExtApps As New ArrayList() #End Region - Public Class Windows Public Shared treeForm As UI.Window.Tree Public Shared treePanel As New DockContent @@ -245,7 +244,7 @@ Namespace App End Sub Public Shared Sub CreateLogger() - log4net.Config.XmlConfigurator.Configure(New FileInfo("mRemote.exe.config")) + log4net.Config.XmlConfigurator.Configure(New FileInfo("mRemoteNG.exe.config")) log = log4net.LogManager.GetLogger("mRemoteNG.Log") End Sub @@ -331,7 +330,6 @@ Namespace App NoReconnectParam = "norc" End If - If ConsParam <> "" Then If File.Exists(cmd(ConsParam)) = False Then If File.Exists(My.Application.Info.DirectoryPath & "\" & cmd(ConsParam)) Then @@ -369,7 +367,7 @@ Namespace App My.Settings.ResetToolbars = True End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't parse command line args" & vbNewLine & ex.Message) + mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strCommandLineArgsCouldNotBeParsed & vbNewLine & ex.Message) End Try End Sub @@ -411,20 +409,21 @@ Namespace App If Editions.Spanlink.Enabled Then If SaveReport() Then + ' ToDo: Change Report.log location File.Delete(My.Application.Info.DirectoryPath & "\Report.log") End If End If sS.Save() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't save settings or dispose SysTray Icon" & vbNewLine & ex.Message, True) + mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSettingsCouldNotBeSavedOrTrayDispose & vbNewLine & ex.Message, True) End Try End Sub End Class #Region "Default Connection" - Public Shared Function DefaultConnectionFromSettings() As mRemote.Connection.Info - DefaultConnection = New mRemote.Connection.Info + Public Shared Function DefaultConnectionFromSettings() As mRemoteNG.Connection.Info + DefaultConnection = New mRemoteNG.Connection.Info DefaultConnection.IsDefault = True Return DefaultConnection @@ -476,8 +475,8 @@ Namespace App #End Region #Region "Default Inheritance" - Public Shared Function DefaultInheritanceFromSettings() As mRemote.Connection.Info.Inheritance - DefaultInheritance = New mRemote.Connection.Info.Inheritance(Nothing) + Public Shared Function DefaultInheritanceFromSettings() As mRemoteNG.Connection.Info.Inheritance + DefaultInheritance = New mRemoteNG.Connection.Info.Inheritance(Nothing) DefaultInheritance.IsDefault = True Return DefaultInheritance @@ -807,9 +806,9 @@ Namespace App For i As Integer = 0 To lD.FileNames.Length - 1 nNode = Tree.Node.AddNode(Tree.Node.Type.Container, "Import #" & i) - Dim nContI As New mRemote.Container.Info() + Dim nContI As New mRemoteNG.Container.Info() nContI.TreeNode = nNode - nContI.ConnectionInfo = New mRemote.Connection.Info(nContI) + nContI.ConnectionInfo = New mRemoteNG.Connection.Info(nContI) If Tree.Node.SelectedNode IsNot Nothing Then If Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.Container Then @@ -848,7 +847,7 @@ Namespace App Dim nNode As TreeNode = Tree.Node.AddNode(Tree.Node.Type.Connection, Path.GetFileNameWithoutExtension(lD.FileNames(i))) - Dim nConI As New mRemote.Connection.Info() + Dim nConI As New mRemoteNG.Connection.Info() nConI.Inherit = New Connection.Info.Inheritance(nConI) nConI.Name = nNode.Text @@ -956,14 +955,14 @@ Namespace App End Try End Sub - Public Shared Sub ImportConnectionsFromPortScan(ByVal Hosts As ArrayList, ByVal Protocol As mRemote.Connection.Protocol.Protocols) + Public Shared Sub ImportConnectionsFromPortScan(ByVal Hosts As ArrayList, ByVal Protocol As mRemoteNG.Connection.Protocol.Protocols) For Each Host As Tools.PortScan.ScanHost In Hosts - Dim finalProt As mRemote.Connection.Protocol.Protocols + Dim finalProt As mRemoteNG.Connection.Protocol.Protocols Dim protOK As Boolean = False Dim nNode As TreeNode = Tree.Node.AddNode(Tree.Node.Type.Connection, Host.HostNameWithoutDomain) - Dim nConI As New mRemote.Connection.Info() + Dim nConI As New mRemoteNG.Connection.Info() nConI.Inherit = New Connection.Info.Inheritance(nConI) nConI.Name = Host.HostNameWithoutDomain @@ -1148,7 +1147,7 @@ Namespace App conS.Save() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, string.Format(My.Resources.strConnectionsFileCouldNotSaveAs,conS.ConnectionFileName) & vbNewLine & ex.Message) + mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strConnectionsFileCouldNotSaveAs, conS.ConnectionFileName) & vbNewLine & ex.Message) End Try End Sub @@ -1224,7 +1223,7 @@ Namespace App End Try End Sub - Public Shared Sub OpenConnection(ByVal Force As mRemote.Connection.Info.Force) + Public Shared Sub OpenConnection(ByVal Force As mRemoteNG.Connection.Info.Force) Try If Windows.treeForm.tvConnections.SelectedNode.Tag Is Nothing Then Exit Sub @@ -1246,7 +1245,7 @@ Namespace App End Try End Sub - Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info) + Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info) Try OpenConnection(ConnectionInfo, Connection.Info.Force.None) Catch ex As Exception @@ -1254,7 +1253,7 @@ Namespace App End Try End Sub - Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info, ByVal ConnectionForm As Form) + Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info, ByVal ConnectionForm As Form) Try OpenConnectionFinal(ConnectionInfo, Connection.Info.Force.None, ConnectionForm) Catch ex As Exception @@ -1262,7 +1261,7 @@ Namespace App End Try End Sub - Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info, ByVal ConnectionForm As Form, ByVal Force As Connection.Info.Force) + Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info, ByVal ConnectionForm As Form, ByVal Force As Connection.Info.Force) Try OpenConnectionFinal(ConnectionInfo, Force, ConnectionForm) Catch ex As Exception @@ -1270,7 +1269,7 @@ Namespace App End Try End Sub - Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info, ByVal Force As mRemote.Connection.Info.Force) + Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info, ByVal Force As mRemoteNG.Connection.Info.Force) Try OpenConnectionFinal(ConnectionInfo, Force, Nothing) Catch ex As Exception @@ -1279,7 +1278,7 @@ Namespace App End Sub - Private Shared Sub OpenConnectionFinal(ByVal nCi As mRemote.Connection.Info, ByVal Force As mRemote.Connection.Info.Force, ByVal ConForm As Form) + Private Shared Sub OpenConnectionFinal(ByVal nCi As mRemoteNG.Connection.Info, ByVal Force As mRemoteNG.Connection.Info.Force, ByVal ConForm As Form) Try If nCi.Hostname = "" And nCi.Protocol <> Connection.Protocol.Protocols.IntApp Then mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strConnectionOpenFailedNoHostname) @@ -1412,7 +1411,7 @@ Namespace App End Sub Public Shared Function SwitchToOpenConnection(ByVal nCi As Connection.Info) As Boolean - Dim IC As mRemote.Connection.InterfaceControl = FindConnectionContainer(nCi) + Dim IC As mRemoteNG.Connection.InterfaceControl = FindConnectionContainer(nCi) If IC IsNot Nothing Then TryCast(IC.FindForm, UI.Window.Connection).Focus() @@ -1480,7 +1479,7 @@ Namespace App End Sub Public Shared Sub Prot_Event_Connected(ByVal sender As Object) - Dim prot As mRemote.Connection.Protocol.Base = sender + Dim prot As mRemoteNG.Connection.Protocol.Base = sender mC.AddMessage(Messages.MessageClass.InformationMsg, "Protocol Event Connected", True) mC.AddMessage(Messages.MessageClass.ReportMsg, "Connection to " & prot.InterfaceControl.Info.Hostname & " via " & prot.InterfaceControl.Info.Protocol.ToString & " established by user " & My.User.Name & " (Description: " & prot.InterfaceControl.Info.Description & "; User Field: " & prot.InterfaceControl.Info.UserField & ")") @@ -1532,7 +1531,7 @@ Namespace App #Region "Misc" Public Shared Sub GoToURL(ByVal URL As String) - Dim cI As New mRemote.Connection.Info + Dim cI As New mRemoteNG.Connection.Info cI.Name = "" cI.Hostname = URL @@ -1544,7 +1543,7 @@ Namespace App cI.SetDefaultPort() cI.IsQuicky = True - App.Runtime.OpenConnection(cI, mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(cI, mRemoteNG.Connection.Info.Force.DoNotJump) End Sub Public Shared Sub GoToWebsite() diff --git a/mRemoteV1/App/App.Update.vb b/mRemoteV1/App/App.Update.vb index 015f3a84..2dc55bc4 100644 --- a/mRemoteV1/App/App.Update.vb +++ b/mRemoteV1/App/App.Update.vb @@ -1,6 +1,6 @@ Imports System.IO Imports System.Net -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace App Public Class Update @@ -191,9 +191,6 @@ Namespace App End Sub #End Region - - - Public Class Info Private _Version As Version Public Property Version() As Version diff --git a/mRemoteV1/ApplicationEvents.vb b/mRemoteV1/ApplicationEvents.vb index 6fe28263..18c2be76 100644 --- a/mRemoteV1/ApplicationEvents.vb +++ b/mRemoteV1/ApplicationEvents.vb @@ -11,7 +11,7 @@ Private Sub MyApplication_Startup(ByVal sender As Object, ByVal e As Microsoft.VisualBasic.ApplicationServices.StartupEventArgs) Handles Me.Startup If My.Settings.SingleInstance Then - Dim mutexID As String = "mRemote_SingleInstanceMutex" + Dim mutexID As String = "mRemoteNG_SingleInstanceMutex" mutex = New System.Threading.Mutex(False, mutexID) diff --git a/mRemoteV1/CHANGELOG.TXT b/mRemoteV1/CHANGELOG.TXT index b01d35e5..81fead8c 100644 --- a/mRemoteV1/CHANGELOG.TXT +++ b/mRemoteV1/CHANGELOG.TXT @@ -1,5 +1,5 @@ 1.64: - AR: Fixed translations, moved everything into resx + AR: Fixed translations, moved everything into resx, refactoring, namespace renamed to mRemoteNG 1.63: New icon and logo diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb index 5fde323a..11859017 100644 --- a/mRemoteV1/Config/Config.Connections.Load.vb +++ b/mRemoteV1/Config/Config.Connections.Load.vb @@ -1,6 +1,6 @@ Imports System.Windows.Forms Imports System.Xml -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Data Imports System.Data.SqlClient Imports System.IO @@ -537,9 +537,9 @@ Namespace Config End If If Me.confVersion >= 2.2 Then - conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod")) + conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod")) conI.RDGatewayHostname = .Item("RDGatewayHostname") - conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials")) + conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials")) conI.RDGatewayUsername = .Item("RDGatewayUsername") conI.RDGatewayPassword = Security.Crypt.Decrypt(.Item("RDGatewayPassword"), pW) conI.RDGatewayDomain = .Item("RDGatewayDomain") @@ -929,7 +929,7 @@ Namespace Config End If If Me.confVersion > 1.5 Then '1.6 - conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value) + conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value) conI.Inherit.ICAEncryption = .Attributes("InheritICAEncryptionStrength").Value conI.PreExtApp = .Attributes("PreExtApp").Value @@ -939,16 +939,16 @@ Namespace Config End If If Me.confVersion > 1.6 Then '1.7 - conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value) - conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value) - conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value) - conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value) + conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value) + conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value) + conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value) + conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value) conI.VNCProxyIP = .Attributes("VNCProxyIP").Value conI.VNCProxyPort = .Attributes("VNCProxyPort").Value conI.VNCProxyUsername = .Attributes("VNCProxyUsername").Value conI.VNCProxyPassword = Security.Crypt.Decrypt(.Attributes("VNCProxyPassword").Value, pW) - conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value) - conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value) + conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value) + conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value) conI.VNCViewOnly = .Attributes("VNCViewOnly").Value conI.Inherit.VNCCompression = .Attributes("InheritVNCCompression").Value @@ -965,13 +965,13 @@ Namespace Config End If If Me.confVersion > 1.7 Then '1.8 - conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value) + conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value) conI.Inherit.RDPAuthenticationLevel = .Attributes("InheritRDPAuthenticationLevel").Value End If If Me.confVersion > 1.8 Then '1.9 - conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value) + conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value) conI.MacAddress = .Attributes("MacAddress").Value conI.Inherit.RenderingEngine = .Attributes("InheritRenderingEngine").Value @@ -989,9 +989,9 @@ Namespace Config End If If Me.confVersion > 2.1 Then '2.2 - conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value) + conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value) conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value - conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value) + conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value) conI.RDGatewayUsername = .Attributes("RDGatewayUsername").Value conI.RDGatewayPassword = Security.Crypt.Decrypt(.Attributes("RDGatewayPassword").Value, pW) conI.RDGatewayDomain = .Attributes("RDGatewayDomain").Value @@ -1010,7 +1010,7 @@ Namespace Config End Try End Function - Private Function Authenticate(ByVal Value As String, ByVal CompareToOriginalValue As Boolean, Optional ByVal RootInfo As mRemote.Root.Info = Nothing) As Boolean + Private Function Authenticate(ByVal Value As String, ByVal CompareToOriginalValue As Boolean, Optional ByVal RootInfo As mRemoteNG.Root.Info = Nothing) As Boolean If CompareToOriginalValue Then Do Until Security.Crypt.Decrypt(Value, pW) <> Value pW = Tools.Misc.PasswordDialog(False) diff --git a/mRemoteV1/Config/Config.Connections.Save.vb b/mRemoteV1/Config/Config.Connections.Save.vb index 64a676e3..9c37e68c 100644 --- a/mRemoteV1/Config/Config.Connections.Save.vb +++ b/mRemoteV1/Config/Config.Connections.Save.vb @@ -1,9 +1,9 @@ Imports System.Windows.Forms Imports System.Xml Imports System.IO -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Data.SqlClient -Imports mRemote.Tools.Misc +Imports mRemoteNG.Tools.Misc Namespace Config Namespace Connections @@ -178,8 +178,8 @@ Namespace Config Dim strProtected As String If tN.Tag IsNot Nothing Then - If TryCast(tN.Tag, mRemote.Root.Info).Password = True Then - pW = TryCast(tN.Tag, mRemote.Root.Info).PasswordString + If TryCast(tN.Tag, mRemoteNG.Root.Info).Password = True Then + pW = TryCast(tN.Tag, mRemoteNG.Root.Info).PasswordString strProtected = Security.Crypt.Encrypt("ThisIsProtected", pW) Else strProtected = Security.Crypt.Encrypt("ThisIsNotProtected", pW) @@ -534,8 +534,8 @@ Namespace Config If exp Then xW.WriteAttributeString("Protected", "", Security.Crypt.Encrypt("ThisIsNotProtected", pW)) Else - If TryCast(tN.Tag, mRemote.Root.Info).Password = True Then - pW = TryCast(tN.Tag, mRemote.Root.Info).PasswordString + If TryCast(tN.Tag, mRemoteNG.Root.Info).Password = True Then + pW = TryCast(tN.Tag, mRemoteNG.Root.Info).PasswordString xW.WriteAttributeString("Protected", "", Security.Crypt.Encrypt("ThisIsProtected", pW)) Else xW.WriteAttributeString("Protected", "", Security.Crypt.Encrypt("ThisIsNotProtected", pW)) diff --git a/mRemoteV1/Config/Config.Settings.Load.vb b/mRemoteV1/Config/Config.Settings.Load.vb index ab3561b8..531a351f 100644 --- a/mRemoteV1/Config/Config.Settings.Load.vb +++ b/mRemoteV1/Config/Config.Settings.Load.vb @@ -1,6 +1,6 @@ Imports System.IO Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Xml Namespace Config diff --git a/mRemoteV1/Config/Config.Settings.Save.vb b/mRemoteV1/Config/Config.Settings.Save.vb index c034e2cc..adea35fa 100644 --- a/mRemoteV1/Config/Config.Settings.Save.vb +++ b/mRemoteV1/Config/Config.Settings.Save.vb @@ -1,4 +1,4 @@ -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Xml Imports System.IO diff --git a/mRemoteV1/Connection/Connection.Icon.vb b/mRemoteV1/Connection/Connection.Icon.vb index 617af775..7e025f02 100644 --- a/mRemoteV1/Connection/Connection.Icon.vb +++ b/mRemoteV1/Connection/Connection.Icon.vb @@ -1,5 +1,5 @@ Imports System.ComponentModel -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Connection Public Class Icon diff --git a/mRemoteV1/Connection/Connection.Info.vb b/mRemoteV1/Connection/Connection.Info.vb index ff729db0..bee16287 100644 --- a/mRemoteV1/Connection/Connection.Info.vb +++ b/mRemoteV1/Connection/Connection.Info.vb @@ -1,7 +1,7 @@ Imports System.Windows.Forms Imports System.ComponentModel -Imports mRemote.Tools.LocalizedAttributes -Imports mRemote.App.Runtime +Imports mRemoteNG.Tools.LocalizedAttributes +Imports mRemoteNG.App.Runtime Namespace Connection _ @@ -50,7 +50,7 @@ Namespace Connection Private _Icon As String = My.Settings.ConDefaultIcon _ @@ -281,7 +281,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNamePuttySession"), _ LocalizedDescription("strPropertyDescriptionPuttySession"), _ - TypeConverter(GetType(mRemote.Connection.PuttySession))> _ + TypeConverter(GetType(mRemoteNG.Connection.PuttySession))> _ Public Property PuttySession() As String Get If Me._Inherit.PuttySession And Me._Parent IsNot Nothing Then @@ -303,7 +303,7 @@ Namespace Connection End Set End Property - Private _ICAEncryption As Connection.Protocol.ICA.EncryptionStrength = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.ICA.EncryptionStrength), My.Settings.ConDefaultICAEncryptionStrength) + Private _ICAEncryption As Connection.Protocol.ICA.EncryptionStrength = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.ICA.EncryptionStrength), My.Settings.ConDefaultICAEncryptionStrength) _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property UseConsoleSession() As Boolean Get If Me._Inherit.UseConsoleSession And Me._Parent IsNot Nothing Then @@ -357,7 +357,7 @@ Namespace Connection End Set End Property - Private _RDPAuthenticationLevel As Connection.Protocol.RDP.AuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.AuthenticationLevel), My.Settings.ConDefaultRDPAuthenticationLevel) + Private _RDPAuthenticationLevel As Connection.Protocol.RDP.AuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.AuthenticationLevel), My.Settings.ConDefaultRDPAuthenticationLevel) _ - Public Property RDGatewayUsageMethod() As mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod + Public Property RDGatewayUsageMethod() As mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod Get If Me._Inherit.RDGatewayUsageMethod And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -434,7 +434,7 @@ Namespace Connection Return _RDGatewayUsageMethod End If End Get - Set(ByVal value As mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod) + Set(ByVal value As mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod) _RDGatewayUsageMethod = value End Set End Property @@ -465,13 +465,13 @@ Namespace Connection End Set End Property - Private _RDGatewayUseConnectionCredentials As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), My.Settings.ConDefaultRDGatewayUseConnectionCredentials) + Private _RDGatewayUseConnectionCredentials As mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), My.Settings.ConDefaultRDGatewayUseConnectionCredentials) _ - Public Property RDGatewayUseConnectionCredentials() As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials + Public Property RDGatewayUseConnectionCredentials() As mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials Get If Me._Inherit.RDGatewayUseConnectionCredentials And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -487,7 +487,7 @@ Namespace Connection Return _RDGatewayUseConnectionCredentials End If End Get - Set(ByVal value As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials) + Set(ByVal value As mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials) _RDGatewayUseConnectionCredentials = value End Set End Property @@ -631,7 +631,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameCacheBitmaps"), _ LocalizedDescription("strPropertyDescriptionCacheBitmaps"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property CacheBitmaps() As Boolean Get If Me._Inherit.CacheBitmaps And Me._Parent IsNot Nothing Then @@ -658,7 +658,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameDisplayWallpaper"), _ LocalizedDescription("strPropertyDescriptionDisplayWallpaper"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property DisplayWallpaper() As Boolean Get If Me._Inherit.DisplayWallpaper And Me._Parent IsNot Nothing Then @@ -685,7 +685,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameDisplayThemes"), _ LocalizedDescription("strPropertyDescriptionDisplayThemes"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property DisplayThemes() As Boolean Get If Me._Inherit.DisplayThemes And Me._Parent IsNot Nothing Then @@ -713,7 +713,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameRedirectKeys"), _ LocalizedDescription("strPropertyDescriptionRedirectKeys"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectKeys() As Boolean Get If Me._Inherit.RedirectKeys And Me._Parent IsNot Nothing Then @@ -740,7 +740,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameRedirectDrives"), _ LocalizedDescription("strPropertyDescriptionRedirectDrives"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectDiskDrives() As Boolean Get If Me._Inherit.RedirectDiskDrives And Me._Parent IsNot Nothing Then @@ -767,7 +767,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameRedirectPrinters"), _ LocalizedDescription("strPropertyDescriptionRedirectPrinters"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectPrinters() As Boolean Get If Me._Inherit.RedirectPrinters And Me._Parent IsNot Nothing Then @@ -794,7 +794,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameRedirectPorts"), _ LocalizedDescription("strPropertyDescriptionRedirectPorts"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectPorts() As Boolean Get If Me._Inherit.RedirectPorts And Me._Parent IsNot Nothing Then @@ -821,7 +821,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameRedirectSmartCards"), _ LocalizedDescription("strPropertyDescriptionRedirectSmartCards"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectSmartCards() As Boolean Get If Me._Inherit.RedirectSmartCards And Me._Parent IsNot Nothing Then @@ -978,13 +978,13 @@ Namespace Connection End Property #End Region #Region "VNC" - Private _VNCCompression As mRemote.Connection.Protocol.VNC.Compression = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Compression), My.Settings.ConDefaultVNCCompression) + Private _VNCCompression As mRemoteNG.Connection.Protocol.VNC.Compression = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Compression), My.Settings.ConDefaultVNCCompression) _ - Public Property VNCCompression() As mRemote.Connection.Protocol.VNC.Compression + Public Property VNCCompression() As mRemoteNG.Connection.Protocol.VNC.Compression Get If Me._Inherit.VNCCompression And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -1000,18 +1000,18 @@ Namespace Connection Return _VNCCompression End If End Get - Set(ByVal value As mRemote.Connection.Protocol.VNC.Compression) + Set(ByVal value As mRemoteNG.Connection.Protocol.VNC.Compression) _VNCCompression = value End Set End Property - Private _VNCEncoding As mRemote.Connection.Protocol.VNC.Encoding = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Encoding), My.Settings.ConDefaultVNCEncoding) + Private _VNCEncoding As mRemoteNG.Connection.Protocol.VNC.Encoding = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Encoding), My.Settings.ConDefaultVNCEncoding) _ - Public Property VNCEncoding() As mRemote.Connection.Protocol.VNC.Encoding + Public Property VNCEncoding() As mRemoteNG.Connection.Protocol.VNC.Encoding Get If Me._Inherit.VNCEncoding And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -1027,19 +1027,19 @@ Namespace Connection Return _VNCEncoding End If End Get - Set(ByVal value As mRemote.Connection.Protocol.VNC.Encoding) + Set(ByVal value As mRemoteNG.Connection.Protocol.VNC.Encoding) _VNCEncoding = value End Set End Property - Private _VNCAuthMode As mRemote.Connection.Protocol.VNC.AuthMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.AuthMode), My.Settings.ConDefaultVNCAuthMode) + Private _VNCAuthMode As mRemoteNG.Connection.Protocol.VNC.AuthMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.AuthMode), My.Settings.ConDefaultVNCAuthMode) _ - Public Property VNCAuthMode() As mRemote.Connection.Protocol.VNC.AuthMode + Public Property VNCAuthMode() As mRemoteNG.Connection.Protocol.VNC.AuthMode Get If Me._Inherit.VNCAuthMode And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -1055,18 +1055,18 @@ Namespace Connection Return _VNCAuthMode End If End Get - Set(ByVal value As mRemote.Connection.Protocol.VNC.AuthMode) + Set(ByVal value As mRemoteNG.Connection.Protocol.VNC.AuthMode) _VNCAuthMode = value End Set End Property - Private _VNCProxyType As mRemote.Connection.Protocol.VNC.ProxyType = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.ProxyType), My.Settings.ConDefaultVNCProxyType) + Private _VNCProxyType As mRemoteNG.Connection.Protocol.VNC.ProxyType = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.ProxyType), My.Settings.ConDefaultVNCProxyType) _ - Public Property VNCProxyType() As mRemote.Connection.Protocol.VNC.ProxyType + Public Property VNCProxyType() As mRemoteNG.Connection.Protocol.VNC.ProxyType Get If Me._Inherit.VNCProxyType And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -1082,7 +1082,7 @@ Namespace Connection Return _VNCProxyType End If End Get - Set(ByVal value As mRemote.Connection.Protocol.VNC.ProxyType) + Set(ByVal value As mRemoteNG.Connection.Protocol.VNC.ProxyType) _VNCProxyType = value End Set End Property @@ -1192,13 +1192,13 @@ Namespace Connection End Set End Property - Private _VNCColors As mRemote.Connection.Protocol.VNC.Colors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Colors), My.Settings.ConDefaultVNCColors) + Private _VNCColors As mRemoteNG.Connection.Protocol.VNC.Colors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Colors), My.Settings.ConDefaultVNCColors) _ - Public Property VNCColors() As mRemote.Connection.Protocol.VNC.Colors + Public Property VNCColors() As mRemoteNG.Connection.Protocol.VNC.Colors Get If Me._Inherit.VNCColors And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -1214,18 +1214,18 @@ Namespace Connection Return _VNCColors End If End Get - Set(ByVal value As mRemote.Connection.Protocol.VNC.Colors) + Set(ByVal value As mRemoteNG.Connection.Protocol.VNC.Colors) _VNCColors = value End Set End Property - Private _VNCSmartSizeMode As mRemote.Connection.Protocol.VNC.SmartSizeMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.SmartSizeMode), My.Settings.ConDefaultVNCSmartSizeMode) + Private _VNCSmartSizeMode As mRemoteNG.Connection.Protocol.VNC.SmartSizeMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.SmartSizeMode), My.Settings.ConDefaultVNCSmartSizeMode) _ - Public Property VNCSmartSizeMode() As mRemote.Connection.Protocol.VNC.SmartSizeMode + Public Property VNCSmartSizeMode() As mRemoteNG.Connection.Protocol.VNC.SmartSizeMode Get If Me._Inherit.VNCSmartSizeMode And Me._Parent IsNot Nothing Then Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo @@ -1241,7 +1241,7 @@ Namespace Connection Return _VNCSmartSizeMode End If End Get - Set(ByVal value As mRemote.Connection.Protocol.VNC.SmartSizeMode) + Set(ByVal value As mRemoteNG.Connection.Protocol.VNC.SmartSizeMode) _VNCSmartSizeMode = value End Set End Property @@ -1546,7 +1546,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property EverythingInherited() As Boolean Get If Me._CacheBitmaps And Me._Colors And Me._Description And Me._DisplayThemes And Me._DisplayWallpaper _ @@ -1575,7 +1575,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Description() As Boolean Get Return Me._Description @@ -1589,7 +1589,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Icon() As Boolean Get Return Me._Icon @@ -1603,7 +1603,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Panel() As Boolean Get Return Me._Panel @@ -1618,7 +1618,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Username() As Boolean Get Return Me._Username @@ -1632,7 +1632,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Password() As Boolean Get Return Me._Password @@ -1646,7 +1646,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Domain() As Boolean Get Return Me._Domain @@ -1661,7 +1661,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Protocol() As Boolean Get Return Me._Protocol @@ -1675,7 +1675,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property ExtApp() As Boolean Get Return Me._ExtApp @@ -1689,7 +1689,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Port() As Boolean Get Return Me._Port @@ -1703,7 +1703,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property PuttySession() As Boolean Get Return Me._PuttySession @@ -1717,7 +1717,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property ICAEncryption() As Boolean Get Return Me._ICAEncryption @@ -1731,7 +1731,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RDPAuthenticationLevel() As Boolean Get Return Me._RDPAuthenticationLevel @@ -1745,7 +1745,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RenderingEngine() As Boolean Get Return Me._RenderingEngine @@ -1759,7 +1759,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property UseConsoleSession() As Boolean Get Return Me._UseConsoleSession @@ -1774,7 +1774,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RDGatewayUsageMethod() As Boolean Get Return Me._RDGatewayUsageMethod @@ -1788,7 +1788,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RDGatewayHostname() As Boolean Get Return Me._RDGatewayHostname @@ -1802,7 +1802,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RDGatewayUseConnectionCredentials() As Boolean Get Return Me._RDGatewayUseConnectionCredentials @@ -1817,7 +1817,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameRDGatewayUsername"), _ LocalizedDescription("strPropertyDescriptionRDGatewayUsername"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RDGatewayUsername() As Boolean Get Return Me._RDGatewayUsername @@ -1832,7 +1832,7 @@ Namespace Connection Browsable(True), _ LocalizedDisplayName("strPropertyNameRDGatewayPasswordInherit"), _ LocalizedDescription("strPropertyDescriptionRDGatewayPasswordInherit"), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RDGatewayPassword() As Boolean Get Return Me._RDGatewayPassword @@ -1846,7 +1846,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RDGatewayDomain() As Boolean Get Return Me._RDGatewayDomain @@ -1861,7 +1861,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Resolution() As Boolean Get Return Me._Resolution @@ -1875,7 +1875,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Colors() As Boolean Get Return Me._Colors @@ -1889,7 +1889,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property CacheBitmaps() As Boolean Get Return Me._CacheBitmaps @@ -1903,7 +1903,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property DisplayWallpaper() As Boolean Get Return Me._DisplayWallpaper @@ -1917,7 +1917,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property DisplayThemes() As Boolean Get Return Me._DisplayThemes @@ -1932,7 +1932,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectKeys() As Boolean Get Return Me._RedirectKeys @@ -1946,7 +1946,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectDiskDrives() As Boolean Get Return Me._RedirectDiskDrives @@ -1960,7 +1960,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectPrinters() As Boolean Get Return Me._RedirectPrinters @@ -1974,7 +1974,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectPorts() As Boolean Get Return Me._RedirectPorts @@ -1988,7 +1988,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectSmartCards() As Boolean Get Return Me._RedirectSmartCards @@ -2002,7 +2002,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property RedirectSound() As Boolean Get Return Me._RedirectSound @@ -2017,7 +2017,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property PreExtApp() As Boolean Get Return Me._PreExtApp @@ -2031,7 +2031,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property PostExtApp() As Boolean Get Return Me._PostExtApp @@ -2045,7 +2045,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property MacAddress() As Boolean Get Return Me._MacAddress @@ -2059,7 +2059,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property UserField() As Boolean Get Return Me._UserField @@ -2074,7 +2074,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCCompression() As Boolean Get Return _VNCCompression @@ -2088,7 +2088,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCEncoding() As Boolean Get Return _VNCEncoding @@ -2102,7 +2102,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCAuthMode() As Boolean Get Return _VNCAuthMode @@ -2116,7 +2116,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCProxyType() As Boolean Get Return _VNCProxyType @@ -2130,7 +2130,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCProxyIP() As Boolean Get Return _VNCProxyIP @@ -2144,7 +2144,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCProxyPort() As Boolean Get Return _VNCProxyPort @@ -2158,7 +2158,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCProxyUsername() As Boolean Get Return _VNCProxyUsername @@ -2172,7 +2172,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCProxyPassword() As Boolean Get Return _VNCProxyPassword @@ -2186,7 +2186,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCColors() As Boolean Get Return _VNCColors @@ -2200,7 +2200,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCSmartSizeMode() As Boolean Get Return _VNCSmartSizeMode @@ -2214,7 +2214,7 @@ Namespace Connection _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property VNCViewOnly() As Boolean Get Return _VNCViewOnly diff --git a/mRemoteV1/Connection/Connection.InterfaceControl.vb b/mRemoteV1/Connection/Connection.InterfaceControl.vb index 4a65d9af..99fb5367 100644 --- a/mRemoteV1/Connection/Connection.InterfaceControl.vb +++ b/mRemoteV1/Connection/Connection.InterfaceControl.vb @@ -1,6 +1,6 @@ Imports System.Windows.Forms Imports System.Drawing -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Connection Public Class InterfaceControl diff --git a/mRemoteV1/Connection/Connection.List.vb b/mRemoteV1/Connection/Connection.List.vb index 6f7cc0e7..28a9363a 100644 --- a/mRemoteV1/Connection/Connection.List.vb +++ b/mRemoteV1/Connection/Connection.List.vb @@ -1,5 +1,3 @@ -Imports System.Windows.Forms - Namespace Connection Public Class List Inherits CollectionBase diff --git a/mRemoteV1/Connection/Connection.Protocol.Base.vb b/mRemoteV1/Connection/Connection.Protocol.Base.vb index 9cea91e3..e09ad705 100644 --- a/mRemoteV1/Connection/Connection.Protocol.Base.vb +++ b/mRemoteV1/Connection/Connection.Protocol.Base.vb @@ -1,6 +1,6 @@ Imports System.Windows.Forms Imports System.Threading -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Connection Namespace Protocol @@ -39,12 +39,12 @@ Namespace Connection End Property #End Region - Private _Force As mRemote.Connection.Info.Force - Public Property Force() As mRemote.Connection.Info.Force + Private _Force As mRemoteNG.Connection.Info.Force + Public Property Force() As mRemoteNG.Connection.Info.Force Get Return Me._Force End Get - Set(ByVal value As mRemote.Connection.Info.Force) + Set(ByVal value As mRemoteNG.Connection.Info.Force) Me._Force = value End Set End Property diff --git a/mRemoteV1/Connection/Connection.Protocol.HTTP.vb b/mRemoteV1/Connection/Connection.Protocol.HTTP.vb index 3ca4dc7b..5ed498fc 100644 --- a/mRemoteV1/Connection/Connection.Protocol.HTTP.vb +++ b/mRemoteV1/Connection/Connection.Protocol.HTTP.vb @@ -1,6 +1,3 @@ -Imports System.Windows.Forms -Imports mRemote.App.Runtime - Namespace Connection Namespace Protocol Public Class HTTP diff --git a/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb b/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb index de0988a3..21dae5d1 100644 --- a/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb +++ b/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb @@ -1,5 +1,5 @@ Imports System.Windows.Forms -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.ComponentModel Namespace Connection diff --git a/mRemoteV1/Connection/Connection.Protocol.HTTPS.vb b/mRemoteV1/Connection/Connection.Protocol.HTTPS.vb index 04759971..225671b9 100644 --- a/mRemoteV1/Connection/Connection.Protocol.HTTPS.vb +++ b/mRemoteV1/Connection/Connection.Protocol.HTTPS.vb @@ -1,5 +1,5 @@ Imports System.Windows.Forms -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Connection Namespace Protocol diff --git a/mRemoteV1/Connection/Connection.Protocol.ICA.vb b/mRemoteV1/Connection/Connection.Protocol.ICA.vb index e0bded7c..953b2607 100644 --- a/mRemoteV1/Connection/Connection.Protocol.ICA.vb +++ b/mRemoteV1/Connection/Connection.Protocol.ICA.vb @@ -1,4 +1,4 @@ -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Threading Imports AxWFICALib Imports System.ComponentModel diff --git a/mRemoteV1/Connection/Connection.Protocol.IntApp.vb b/mRemoteV1/Connection/Connection.Protocol.IntApp.vb index af98760e..e149a071 100644 --- a/mRemoteV1/Connection/Connection.Protocol.IntApp.vb +++ b/mRemoteV1/Connection/Connection.Protocol.IntApp.vb @@ -1,8 +1,8 @@ -Imports mRemote.App.Native +Imports mRemoteNG.App.Native Imports System.Threading Imports Microsoft.Win32 Imports System.Drawing -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Connection Namespace Protocol diff --git a/mRemoteV1/Connection/Connection.Protocol.Protocols.vb b/mRemoteV1/Connection/Connection.Protocol.Protocols.vb index 9478b3d5..e6505efa 100644 --- a/mRemoteV1/Connection/Connection.Protocol.Protocols.vb +++ b/mRemoteV1/Connection/Connection.Protocol.Protocols.vb @@ -1,29 +1,30 @@ Imports System.ComponentModel +Imports mRemoteNG.Tools.LocalizedAttributes Namespace Connection Namespace Protocol Public Enum Protocols - _ + _ RDP = 0 - _ + _ VNC = 1 - _ + _ SSH1 = 2 - _ + _ SSH2 = 3 - _ + _ Telnet = 4 - _ + _ Rlogin = 5 - _ + _ RAW = 6 - _ + _ HTTP = 7 - _ + _ HTTPS = 8 - _ + _ ICA = 9 - _ + _ IntApp = 20 _ NONE = 999 diff --git a/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb b/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb index d234e435..4578ff53 100644 --- a/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb +++ b/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb @@ -1,8 +1,8 @@ -Imports mRemote.App.Native +Imports mRemoteNG.App.Native Imports System.Threading Imports Microsoft.Win32 Imports System.Drawing -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Connection Namespace Protocol @@ -258,7 +258,7 @@ Namespace Connection p = Process.Start(pSI) p.WaitForExit() - mRemote.Connection.PuttySession.PuttySessions = GetSessions() + mRemoteNG.Connection.PuttySession.PuttySessions = GetSessions() Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Start Putty (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True) End Try diff --git a/mRemoteV1/Connection/Connection.Protocol.RDP.vb b/mRemoteV1/Connection/Connection.Protocol.RDP.vb index c64430af..82f0778d 100644 --- a/mRemoteV1/Connection/Connection.Protocol.RDP.vb +++ b/mRemoteV1/Connection/Connection.Protocol.RDP.vb @@ -3,8 +3,8 @@ Imports System.Threading Imports AxMSTSCLib Imports EOLWTSCOM Imports System.ComponentModel -Imports mRemote.App.Runtime -Imports mRemote.Tools.LocalizedAttributes +Imports mRemoteNG.App.Runtime +Imports mRemoteNG.Tools.LocalizedAttributes Namespace Connection Namespace Protocol diff --git a/mRemoteV1/Connection/Connection.Protocol.VNC.vb b/mRemoteV1/Connection/Connection.Protocol.VNC.vb index ef430801..c3a09f04 100644 --- a/mRemoteV1/Connection/Connection.Protocol.VNC.vb +++ b/mRemoteV1/Connection/Connection.Protocol.VNC.vb @@ -1,6 +1,7 @@ -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports VncSharp Imports System.ComponentModel +Imports mRemoteNG.Tools.LocalizedAttributes Namespace Connection Namespace Protocol @@ -242,9 +243,9 @@ Namespace Connection CtrlEsc End Enum - Public Enum Compression ' TODO: Translate this - _ - CompNone = 99 ' My.Resources.strNoCompression + Public Enum Compression + _ + CompNone = 99 _ Comp0 = 0 _ @@ -287,37 +288,37 @@ Namespace Connection End Enum Public Enum AuthMode - _ + _ AuthVNC - _ + _ AuthWin End Enum - Public Enum ProxyType ' TODO: Translate this - _ - ProxyNone ' My.Resources.strNone - _ + Public Enum ProxyType + _ + ProxyNone + _ ProxyHTTP - _ + _ ProxySocks5 - _ + _ ProxyUltra End Enum - Public Enum Colors ' TODO: Translate this - _ - ColNormal 'My.Resources.strNormal + Public Enum Colors + _ + ColNormal _ Col8Bit End Enum - Public Enum SmartSizeMode ' TODO: Translate this - _ - SmartSNo ' My.Resources.strNoSmartSize - _ - SmartSFree ' My.Resources.strFree - _ - SmartSAspect ' My.Resources.strAspect + Public Enum SmartSizeMode + _ + SmartSNo + _ + SmartSFree + _ + SmartSAspect End Enum #End Region End Class diff --git a/mRemoteV1/Connection/Connection.QuickConnect.vb b/mRemoteV1/Connection/Connection.QuickConnect.vb index 1fd23bed..4cac3828 100644 --- a/mRemoteV1/Connection/Connection.QuickConnect.vb +++ b/mRemoteV1/Connection/Connection.QuickConnect.vb @@ -1,4 +1,4 @@ -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Connection Public Class QuickConnect diff --git a/mRemoteV1/Container/Container.Info.vb b/mRemoteV1/Container/Container.Info.vb index cd408164..140a2274 100644 --- a/mRemoteV1/Container/Container.Info.vb +++ b/mRemoteV1/Container/Container.Info.vb @@ -1,6 +1,6 @@ Imports System.Windows.Forms Imports System.ComponentModel -Imports mRemote.Tools.LocalizedAttributes +Imports mRemoteNG.Tools.LocalizedAttributes Namespace Container _ diff --git a/mRemoteV1/Container/Container.List.vb b/mRemoteV1/Container/Container.List.vb index d0ea780a..52bed4c4 100644 --- a/mRemoteV1/Container/Container.List.vb +++ b/mRemoteV1/Container/Container.List.vb @@ -1,5 +1,3 @@ -Imports System.Windows.Forms - Namespace Container Public Class List Inherits CollectionBase diff --git a/mRemoteV1/Credential/Credential.Info.vb b/mRemoteV1/Credential/Credential.Info.vb index 69fc4cd1..4dcdc103 100644 --- a/mRemoteV1/Credential/Credential.Info.vb +++ b/mRemoteV1/Credential/Credential.Info.vb @@ -1,5 +1,5 @@ Imports System.ComponentModel -Imports mRemote.Tools.LocalizedAttributes +Imports mRemoteNG.Tools.LocalizedAttributes Namespace Credential Public Class Info diff --git a/mRemoteV1/Forms/frmChoosePanel.Designer.vb b/mRemoteV1/Forms/frmChoosePanel.Designer.vb index 848471a9..7a38826c 100644 --- a/mRemoteV1/Forms/frmChoosePanel.Designer.vb +++ b/mRemoteV1/Forms/frmChoosePanel.Designer.vb @@ -60,7 +60,7 @@ Partial Class frmChoosePanel 'btnNew ' Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnNew.Image = Global.mRemote.My.Resources.Resources.Panel_Add + Me.btnNew.Image = Global.mRemoteNG.My.Resources.Resources.Panel_Add Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnNew.Location = New System.Drawing.Point(10, 44) Me.btnNew.Name = "btnNew" @@ -94,7 +94,7 @@ Partial Class frmChoosePanel Me.Controls.Add(Me.btnOK) Me.Controls.Add(Me.cbPanels) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle - Me.Icon = Global.mRemote.My.Resources.Resources.Panels_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Panels_Icon Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmChoosePanel" diff --git a/mRemoteV1/Forms/frmChoosePanel.vb b/mRemoteV1/Forms/frmChoosePanel.vb index 7b64ad34..b74b77da 100644 --- a/mRemoteV1/Forms/frmChoosePanel.vb +++ b/mRemoteV1/Forms/frmChoosePanel.vb @@ -1,4 +1,4 @@ -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Public Class frmChoosePanel Public Property Panel() As String diff --git a/mRemoteV1/Forms/frmMain.Designer.vb b/mRemoteV1/Forms/frmMain.Designer.vb index 02df049e..22249eb5 100644 --- a/mRemoteV1/Forms/frmMain.Designer.vb +++ b/mRemoteV1/Forms/frmMain.Designer.vb @@ -211,7 +211,7 @@ Partial Class frmMain ' 'mMenFileNewConnection ' - Me.mMenFileNewConnection.Image = Global.mRemote.My.Resources.Resources.Connection_Add + Me.mMenFileNewConnection.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Add Me.mMenFileNewConnection.Name = "mMenFileNewConnection" Me.mMenFileNewConnection.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys) Me.mMenFileNewConnection.Size = New System.Drawing.Size(334, 22) @@ -219,7 +219,7 @@ Partial Class frmMain ' 'mMenFileNewFolder ' - Me.mMenFileNewFolder.Image = Global.mRemote.My.Resources.Resources.Folder_Add + Me.mMenFileNewFolder.Image = Global.mRemoteNG.My.Resources.Resources.Folder_Add Me.mMenFileNewFolder.Name = "mMenFileNewFolder" Me.mMenFileNewFolder.ShortcutKeys = System.Windows.Forms.Keys.F7 Me.mMenFileNewFolder.Size = New System.Drawing.Size(334, 22) @@ -232,7 +232,7 @@ Partial Class frmMain ' 'mMenFileNew ' - Me.mMenFileNew.Image = Global.mRemote.My.Resources.Resources.Connections_New + Me.mMenFileNew.Image = Global.mRemoteNG.My.Resources.Resources.Connections_New Me.mMenFileNew.Name = "mMenFileNew" Me.mMenFileNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) Me.mMenFileNew.Size = New System.Drawing.Size(334, 22) @@ -240,7 +240,7 @@ Partial Class frmMain ' 'mMenFileLoad ' - Me.mMenFileLoad.Image = Global.mRemote.My.Resources.Resources.Connections_Load + Me.mMenFileLoad.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Load Me.mMenFileLoad.Name = "mMenFileLoad" Me.mMenFileLoad.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) Me.mMenFileLoad.Size = New System.Drawing.Size(334, 22) @@ -248,7 +248,7 @@ Partial Class frmMain ' 'mMenFileSave ' - Me.mMenFileSave.Image = Global.mRemote.My.Resources.Resources.Connections_Save + Me.mMenFileSave.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Save Me.mMenFileSave.Name = "mMenFileSave" Me.mMenFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) Me.mMenFileSave.Size = New System.Drawing.Size(334, 22) @@ -256,7 +256,7 @@ Partial Class frmMain ' 'mMenFileSaveAs ' - Me.mMenFileSaveAs.Image = Global.mRemote.My.Resources.Resources.Connections_SaveAs + Me.mMenFileSaveAs.Image = Global.mRemoteNG.My.Resources.Resources.Connections_SaveAs Me.mMenFileSaveAs.Name = "mMenFileSaveAs" Me.mMenFileSaveAs.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _ Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) @@ -317,21 +317,21 @@ Partial Class frmMain ' 'mMenFileDelete ' - Me.mMenFileDelete.Image = Global.mRemote.My.Resources.Resources.Delete + Me.mMenFileDelete.Image = Global.mRemoteNG.My.Resources.Resources.Delete Me.mMenFileDelete.Name = "mMenFileDelete" Me.mMenFileDelete.Size = New System.Drawing.Size(334, 22) Me.mMenFileDelete.Text = "Delete..." ' 'mMenFileRename ' - Me.mMenFileRename.Image = Global.mRemote.My.Resources.Resources.Rename + Me.mMenFileRename.Image = Global.mRemoteNG.My.Resources.Resources.Rename Me.mMenFileRename.Name = "mMenFileRename" Me.mMenFileRename.Size = New System.Drawing.Size(334, 22) Me.mMenFileRename.Text = "Rename" ' 'mMenFileDuplicate ' - Me.mMenFileDuplicate.Image = Global.mRemote.My.Resources.Resources.Connection_Duplicate + Me.mMenFileDuplicate.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Duplicate Me.mMenFileDuplicate.Name = "mMenFileDuplicate" Me.mMenFileDuplicate.Size = New System.Drawing.Size(334, 22) Me.mMenFileDuplicate.Text = "Duplicate" @@ -343,7 +343,7 @@ Partial Class frmMain ' 'mMenFileExit ' - Me.mMenFileExit.Image = Global.mRemote.My.Resources.Resources.Quit + Me.mMenFileExit.Image = Global.mRemoteNG.My.Resources.Resources.Quit Me.mMenFileExit.Name = "mMenFileExit" Me.mMenFileExit.ShortcutKeys = CType((System.Windows.Forms.Keys.Alt Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys) Me.mMenFileExit.Size = New System.Drawing.Size(334, 22) @@ -358,14 +358,14 @@ Partial Class frmMain ' 'mMenViewAddConnectionPanel ' - Me.mMenViewAddConnectionPanel.Image = Global.mRemote.My.Resources.Resources.Panel_Add + Me.mMenViewAddConnectionPanel.Image = Global.mRemoteNG.My.Resources.Resources.Panel_Add Me.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel" Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(228, 22) Me.mMenViewAddConnectionPanel.Text = "Add Connection Panel" ' 'mMenViewConnectionPanels ' - Me.mMenViewConnectionPanels.Image = Global.mRemote.My.Resources.Resources.Panels + Me.mMenViewConnectionPanels.Image = Global.mRemoteNG.My.Resources.Resources.Panels Me.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels" Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(228, 22) Me.mMenViewConnectionPanels.Text = "Connection Panels" @@ -379,7 +379,7 @@ Partial Class frmMain ' Me.mMenViewConnections.Checked = True Me.mMenViewConnections.CheckState = System.Windows.Forms.CheckState.Checked - Me.mMenViewConnections.Image = Global.mRemote.My.Resources.Resources.Root + Me.mMenViewConnections.Image = Global.mRemoteNG.My.Resources.Resources.Root Me.mMenViewConnections.Name = "mMenViewConnections" Me.mMenViewConnections.Size = New System.Drawing.Size(228, 22) Me.mMenViewConnections.Text = "Connections" @@ -406,7 +406,7 @@ Partial Class frmMain ' Me.mMenViewErrorsAndInfos.Checked = True Me.mMenViewErrorsAndInfos.CheckState = System.Windows.Forms.CheckState.Checked - Me.mMenViewErrorsAndInfos.Image = Global.mRemote.My.Resources.Resources.ErrorsAndInfos + Me.mMenViewErrorsAndInfos.Image = Global.mRemoteNG.My.Resources.Resources.ErrorsAndInfos Me.mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos" Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(228, 22) Me.mMenViewErrorsAndInfos.Text = "Errors and Infos" @@ -426,7 +426,7 @@ Partial Class frmMain 'mMenViewJumpTo ' Me.mMenViewJumpTo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewJumpToConnectionsConfig, Me.mMenViewJumpToSessionsScreenshots, Me.mMenViewJumpToErrorsInfos}) - Me.mMenViewJumpTo.Image = Global.mRemote.My.Resources.Resources.JumpTo + Me.mMenViewJumpTo.Image = Global.mRemoteNG.My.Resources.Resources.JumpTo Me.mMenViewJumpTo.Name = "mMenViewJumpTo" Me.mMenViewJumpTo.Size = New System.Drawing.Size(228, 22) Me.mMenViewJumpTo.Text = "Jump To" @@ -468,7 +468,7 @@ Partial Class frmMain ' 'mMenViewQuickConnectToolbar ' - Me.mMenViewQuickConnectToolbar.Image = Global.mRemote.My.Resources.Resources.Play_Quick + Me.mMenViewQuickConnectToolbar.Image = Global.mRemoteNG.My.Resources.Resources.Play_Quick Me.mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar" Me.mMenViewQuickConnectToolbar.Size = New System.Drawing.Size(228, 22) Me.mMenViewQuickConnectToolbar.Text = "Quick Connect Toolbar" @@ -487,7 +487,7 @@ Partial Class frmMain ' 'mMenViewFullscreen ' - Me.mMenViewFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen + Me.mMenViewFullscreen.Image = Global.mRemoteNG.My.Resources.Resources.Fullscreen Me.mMenViewFullscreen.Name = "mMenViewFullscreen" Me.mMenViewFullscreen.ShortcutKeys = System.Windows.Forms.Keys.F11 Me.mMenViewFullscreen.Size = New System.Drawing.Size(228, 22) @@ -502,14 +502,14 @@ Partial Class frmMain ' 'mMenToolsSSHTransfer ' - Me.mMenToolsSSHTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer + Me.mMenToolsSSHTransfer.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer Me.mMenToolsSSHTransfer.Name = "mMenToolsSSHTransfer" Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(184, 22) Me.mMenToolsSSHTransfer.Text = "SSH File Transfer" ' 'mMenToolsUVNCSC ' - Me.mMenToolsUVNCSC.Image = Global.mRemote.My.Resources.Resources.UVNC_SC + Me.mMenToolsUVNCSC.Image = Global.mRemoteNG.My.Resources.Resources.UVNC_SC Me.mMenToolsUVNCSC.Name = "mMenToolsUVNCSC" Me.mMenToolsUVNCSC.Size = New System.Drawing.Size(184, 22) Me.mMenToolsUVNCSC.Text = "UltraVNC SingleClick" @@ -524,7 +524,7 @@ Partial Class frmMain ' 'mMenToolsPortScan ' - Me.mMenToolsPortScan.Image = Global.mRemote.My.Resources.Resources.PortScan + Me.mMenToolsPortScan.Image = Global.mRemoteNG.My.Resources.Resources.PortScan Me.mMenToolsPortScan.Name = "mMenToolsPortScan" Me.mMenToolsPortScan.Size = New System.Drawing.Size(184, 22) Me.mMenToolsPortScan.Text = "Port Scan" @@ -536,7 +536,7 @@ Partial Class frmMain ' 'mMenToolsComponentsCheck ' - Me.mMenToolsComponentsCheck.Image = Global.mRemote.My.Resources.Resources.ComponentsCheck + Me.mMenToolsComponentsCheck.Image = Global.mRemoteNG.My.Resources.Resources.ComponentsCheck Me.mMenToolsComponentsCheck.Name = "mMenToolsComponentsCheck" Me.mMenToolsComponentsCheck.Size = New System.Drawing.Size(184, 22) Me.mMenToolsComponentsCheck.Text = "Components Check" @@ -578,7 +578,7 @@ Partial Class frmMain ' 'mMenInfoDonate ' - Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate + Me.mMenInfoDonate.Image = Global.mRemoteNG.My.Resources.Resources.Donate Me.mMenInfoDonate.Name = "mMenInfoDonate" Me.mMenInfoDonate.Size = New System.Drawing.Size(190, 22) Me.mMenInfoDonate.Text = "Donate" @@ -591,7 +591,7 @@ Partial Class frmMain ' 'mMenInfoBugReport ' - Me.mMenInfoBugReport.Image = Global.mRemote.My.Resources.Resources.Bug + Me.mMenInfoBugReport.Image = Global.mRemoteNG.My.Resources.Resources.Bug Me.mMenInfoBugReport.Name = "mMenInfoBugReport" Me.mMenInfoBugReport.Size = New System.Drawing.Size(190, 22) Me.mMenInfoBugReport.Text = "Report a Bug" @@ -603,14 +603,14 @@ Partial Class frmMain ' 'mMenInfoAnnouncements ' - Me.mMenInfoAnnouncements.Image = Global.mRemote.My.Resources.Resources.News + Me.mMenInfoAnnouncements.Image = Global.mRemoteNG.My.Resources.Resources.News Me.mMenInfoAnnouncements.Name = "mMenInfoAnnouncements" Me.mMenInfoAnnouncements.Size = New System.Drawing.Size(190, 22) Me.mMenInfoAnnouncements.Text = "Announcements" ' 'mMenToolsUpdate ' - Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update + Me.mMenToolsUpdate.Image = Global.mRemoteNG.My.Resources.Resources.Update Me.mMenToolsUpdate.Name = "mMenToolsUpdate" Me.mMenToolsUpdate.Size = New System.Drawing.Size(190, 22) Me.mMenToolsUpdate.Text = "Check for Updates" @@ -622,7 +622,7 @@ Partial Class frmMain ' 'mMenInfoAbout ' - Me.mMenInfoAbout.Image = Global.mRemote.My.Resources.Resources.mRemote + Me.mMenInfoAbout.Image = Global.mRemoteNG.My.Resources.Resources.mRemote Me.mMenInfoAbout.Name = "mMenInfoAbout" Me.mMenInfoAbout.Size = New System.Drawing.Size(190, 22) Me.mMenInfoAbout.Text = "About mRemoteNG" @@ -715,7 +715,7 @@ Partial Class frmMain 'btnQuickyPlay ' Me.btnQuickyPlay.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnQuickyPlay.Image = Global.mRemote.My.Resources.Resources.Play_Quick + Me.btnQuickyPlay.Image = Global.mRemoteNG.My.Resources.Resources.Play_Quick Me.btnQuickyPlay.ImageTransparentColor = System.Drawing.Color.Magenta Me.btnQuickyPlay.Name = "btnQuickyPlay" Me.btnQuickyPlay.Size = New System.Drawing.Size(32, 22) @@ -726,7 +726,7 @@ Partial Class frmMain Me.mMenQuickyCon.AutoSize = False Me.mMenQuickyCon.AutoToolTip = True Me.mMenQuickyCon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.mMenQuickyCon.Image = Global.mRemote.My.Resources.Resources.Root + Me.mMenQuickyCon.Image = Global.mRemoteNG.My.Resources.Resources.Root Me.mMenQuickyCon.ImageTransparentColor = System.Drawing.Color.Magenta Me.mMenQuickyCon.Name = "mMenQuickyCon" Me.mMenQuickyCon.Size = New System.Drawing.Size(30, 22) @@ -743,7 +743,7 @@ Partial Class frmMain ' 'ToolStripButton1 ' - Me.ToolStripButton1.Image = Global.mRemote.My.Resources.Resources.Play + Me.ToolStripButton1.Image = Global.mRemoteNG.My.Resources.Resources.Play Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton1.Name = "ToolStripButton1" Me.ToolStripButton1.Size = New System.Drawing.Size(72, 22) @@ -751,7 +751,7 @@ Partial Class frmMain ' 'ToolStripButton2 ' - Me.ToolStripButton2.Image = Global.mRemote.My.Resources.Resources.Screenshot + Me.ToolStripButton2.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton2.Name = "ToolStripButton2" Me.ToolStripButton2.Size = New System.Drawing.Size(85, 22) @@ -759,7 +759,7 @@ Partial Class frmMain ' 'ToolStripButton3 ' - Me.ToolStripButton3.Image = Global.mRemote.My.Resources.Resources.Refresh + Me.ToolStripButton3.Image = Global.mRemoteNG.My.Resources.Resources.Refresh Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripButton3.Name = "ToolStripButton3" Me.ToolStripButton3.Size = New System.Drawing.Size(66, 22) @@ -769,7 +769,7 @@ Partial Class frmMain ' Me.ToolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image Me.ToolStripSplitButton1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem2}) - Me.ToolStripSplitButton1.Image = Global.mRemote.My.Resources.Resources.Keyboard + Me.ToolStripSplitButton1.Image = Global.mRemoteNG.My.Resources.Resources.Keyboard Me.ToolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta Me.ToolStripSplitButton1.Name = "ToolStripSplitButton1" Me.ToolStripSplitButton1.Size = New System.Drawing.Size(29, 22) @@ -802,7 +802,7 @@ Partial Class frmMain Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(842, 523) Me.Controls.Add(Me.tsContainer) - Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon Me.MainMenuStrip = Me.msMain Me.Name = "frmMain" Me.Text = "mRemoteNG" diff --git a/mRemoteV1/Forms/frmMain.vb b/mRemoteV1/Forms/frmMain.vb index 5de023b6..b5efd074 100644 --- a/mRemoteV1/Forms/frmMain.vb +++ b/mRemoteV1/Forms/frmMain.vb @@ -1,7 +1,7 @@ -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Reflection Imports Crownwood -Imports mRemote.App.Native +Imports mRemoteNG.App.Native Imports PSTaskDialog Public Class frmMain @@ -246,7 +246,7 @@ Public Class frmMain #Region "Menu" #Region "File" Private Sub mMenFile_DropDownOpening(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFile.DropDownOpening - Select Case Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) + Select Case Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) Case Tree.Node.Type.Root mMenFileImportExport.Enabled = True mMenFileDelete.Enabled = False @@ -523,7 +523,7 @@ Public Class frmMain Try btnQuickyPlay.DropDownItems.Clear() - For Each fI As FieldInfo In GetType(mRemote.Connection.Protocol.Protocols).GetFields + For Each fI As FieldInfo In GetType(mRemoteNG.Connection.Protocol.Protocols).GetFields If fI.Name <> "value__" And fI.Name <> "NONE" And fI.Name <> "IntApp" Then Dim nBtn As New ToolStripMenuItem nBtn.Text = fI.Name @@ -538,21 +538,21 @@ Public Class frmMain Private Sub QuickyProtocolButton_Click(ByVal sender As Object, ByVal e As System.EventArgs) Try - Dim conI As Connection.Info = CreateQuicky(QuickyText, Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.Protocols), sender.Text)) + Dim conI As Connection.Info = CreateQuicky(QuickyText, Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.Protocols), sender.Text)) If conI.Port = 0 Then conI.SetDefaultPort() - If mRemote.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then - mRemote.Connection.QuickConnect.History.Add(conI.Hostname) + If mRemoteNG.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then + mRemoteNG.Connection.QuickConnect.History.Add(conI.Hostname) End If Else - If mRemote.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then - mRemote.Connection.QuickConnect.History.Add(conI.Hostname & ":" & conI.Port) + If mRemoteNG.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then + mRemoteNG.Connection.QuickConnect.History.Add(conI.Hostname & ":" & conI.Port) End If End If - App.Runtime.OpenConnection(conI, mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(conI, mRemoteNG.Connection.Info.Force.DoNotJump) Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "QuickyProtocolButton_Click (frmMain) failed" & vbNewLine & ex.Message, True) End Try @@ -651,7 +651,7 @@ Public Class frmMain Private Sub ConMenItem_MouseDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs) If e.Button = MouseButtons.Left Then - If TypeOf sender.Tag Is mRemote.Connection.Info Then + If TypeOf sender.Tag Is mRemoteNG.Connection.Info Then App.Runtime.OpenConnection(sender.Tag) End If End If @@ -679,7 +679,7 @@ Public Class frmMain Try 'Debug.Print(m.Msg) - Select m.Msg + Select Case m.Msg Case WM_GETTEXT bWmGetTextFlag = True Case WM_WINDOWPOSCHANGED diff --git a/mRemoteV1/Forms/frmPassword.Designer.vb b/mRemoteV1/Forms/frmPassword.Designer.vb index 4cffa045..002364b8 100644 --- a/mRemoteV1/Forms/frmPassword.Designer.vb +++ b/mRemoteV1/Forms/frmPassword.Designer.vb @@ -113,7 +113,7 @@ Partial Class frmPassword ' 'pbLock ' - Me.pbLock.Image = Global.mRemote.My.Resources.Resources.Lock + Me.pbLock.Image = Global.mRemoteNG.My.Resources.Resources.Lock Me.pbLock.Location = New System.Drawing.Point(7, 8) Me.pbLock.Name = "pbLock" Me.pbLock.Size = New System.Drawing.Size(64, 64) diff --git a/mRemoteV1/Language/Resources.de.resx b/mRemoteV1/Language/Resources.de.resx index fa4e996c..0e053678 100644 --- a/mRemoteV1/Language/Resources.de.resx +++ b/mRemoteV1/Language/Resources.de.resx @@ -339,7 +339,7 @@ Hier klicken um die PuTTY Sitzung zu konfigurieren: - Maximale Zeit die auf PuTTY und integrierte Ext. Apps gewartet wird: + Maximale Zeit die auf PuTTY und integrierte externe Programme gewartet wird: Unter der GNU General Public License (GPL) veröffentlicht @@ -1692,4 +1692,52 @@ Starte mit neuer Datei. Abschluss des Downloads ist fehlgeschlagen! + + Die Kommandozeilen Parameter kontnen nicht ausgewertet werden! + + + Konnte die Konfiguration nicht sichern oder das Tray Symbol entfernen! + + + Ultra Vnc Repeater + + + Socks 5 + + + HTTP + + + VNC + + + Windows + + + Externes Programm + + + RDP + + + SSH Version 1 + + + SSH Version 2 + + + Telnet + + + Rlogin + + + Rohdaten (RAW) + + + ICA + + + HTTPS + \ No newline at end of file diff --git a/mRemoteV1/Language/Resources.en-US.resx b/mRemoteV1/Language/Resources.en-US.resx index 64a7b79f..785f1454 100644 --- a/mRemoteV1/Language/Resources.en-US.resx +++ b/mRemoteV1/Language/Resources.en-US.resx @@ -1644,4 +1644,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mRemoteV1/My Project/Application.Designer.vb b/mRemoteV1/My Project/Application.Designer.vb index e0026c1b..b22463ef 100644 --- a/mRemoteV1/My Project/Application.Designer.vb +++ b/mRemoteV1/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:2.0.50727.1433 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:2.0.50727.4927 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -14,10 +14,10 @@ Option Explicit On Namespace My - 'NOTE: This file is auto-generated; do not modify it directly. To make changes, - ' or if you encounter build errors in this file, go to the Project Designer - ' (go to Project Properties or double-click the My Project node in - ' Solution Explorer), and make changes on the Application tab. + 'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern + ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer. + ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Eigenes Projekt" im + ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor. ' Partial Friend Class MyApplication @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.mRemote.frmMain + Me.MainForm = Global.mRemoteNG.frmMain End Sub End Class End Namespace diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index 368e4815..bef98447 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -39,7 +39,7 @@ Namespace My.Resources Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("mRemote.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("mRemoteNG.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan @@ -1553,6 +1553,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Couldn't parse command line args! ähnelt. + ''' + Friend ReadOnly Property strCommandLineArgsCouldNotBeParsed() As String + Get + Return ResourceManager.GetString("strCommandLineArgsCouldNotBeParsed", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Components Check ähnelt. ''' @@ -1914,6 +1923,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Ext. App ähnelt. + ''' + Friend ReadOnly Property strExtApp() As String + Get + Return ResourceManager.GetString("strExtApp", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Includes icons by [FAMFAMFAM] ähnelt. ''' @@ -2067,6 +2085,33 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die HTTP ähnelt. + ''' + Friend ReadOnly Property strHttp() As String + Get + Return ResourceManager.GetString("strHttp", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die HTTPS ähnelt. + ''' + Friend ReadOnly Property strHttps() As String + Get + Return ResourceManager.GetString("strHttps", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die ICA ähnelt. + ''' + Friend ReadOnly Property strICA() As String + Get + Return ResourceManager.GetString("strICA", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Import from Active Directory ähnelt. ''' @@ -4507,6 +4552,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die RAW ähnelt. + ''' + Friend ReadOnly Property strRAW() As String + Get + Return ResourceManager.GetString("strRAW", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die RDP ähnelt. + ''' + Friend ReadOnly Property strRDP() As String + Get + Return ResourceManager.GetString("strRDP", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die 16777216 Colors (24bit) ähnelt. ''' @@ -4696,6 +4759,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Rlogin ähnelt. + ''' + Friend ReadOnly Property strRlogin() As String + Get + Return ResourceManager.GetString("strRlogin", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Save ähnelt. ''' @@ -4786,6 +4858,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Couldn't save settings or dispose SysTray Icon! ähnelt. + ''' + Friend ReadOnly Property strSettingsCouldNotBeSavedOrTrayDispose() As String + Get + Return ResourceManager.GetString("strSettingsCouldNotBeSavedOrTrayDispose", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Show description tooltips in connection tree ähnelt. ''' @@ -4867,6 +4948,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Socks 5 ähnelt. + ''' + Friend ReadOnly Property strSocks5() As String + Get + Return ResourceManager.GetString("strSocks5", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Sort ähnelt. ''' @@ -4921,6 +5011,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die SSH version 1 ähnelt. + ''' + Friend ReadOnly Property strSsh1() As String + Get + Return ResourceManager.GetString("strSsh1", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die SSH version 2 ähnelt. + ''' + Friend ReadOnly Property strSsh2() As String + Get + Return ResourceManager.GetString("strSsh2", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die SSH background transfer failed! ähnelt. ''' @@ -5029,6 +5137,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Telnet ähnelt. + ''' + Friend ReadOnly Property strTelnet() As String + Get + Return ResourceManager.GetString("strTelnet", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die the follwing ähnelt. ''' @@ -5128,6 +5245,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Ultra VNC Repeater ähnelt. + ''' + Friend ReadOnly Property strUltraVncRepeater() As String + Get + Return ResourceManager.GetString("strUltraVncRepeater", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die UltraVNC SingleClick Port ähnelt. ''' @@ -5318,6 +5444,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die VNC ähnelt. + ''' + Friend ReadOnly Property strVnc() As String + Get + Return ResourceManager.GetString("strVnc", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Warn me if authentication fails ähnelt. ''' @@ -5336,6 +5471,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Windows ähnelt. + ''' + Friend ReadOnly Property strWindows() As String + Get + Return ResourceManager.GetString("strWindows", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Write log file (mRemoteNG.log) ähnelt. ''' diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index 83bd112c..f33fd0bc 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -1996,4 +1996,52 @@ Starting with new connections file. Download complete failed! + + Couldn't parse command line args! + + + Couldn't save settings or dispose SysTray Icon! + + + Ultra VNC Repeater + + + Socks 5 + + + HTTP + + + VNC + + + Windows + + + Ext. App + + + RDP + + + SSH version 1 + + + SSH version 2 + + + Telnet + + + Rlogin + + + RAW + + + ICA + + + HTTPS + \ No newline at end of file diff --git a/mRemoteV1/My Project/Settings.Designer.vb b/mRemoteV1/My Project/Settings.Designer.vb index c5270566..31e41628 100644 --- a/mRemoteV1/My Project/Settings.Designer.vb +++ b/mRemoteV1/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:2.0.50727.4927 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:2.0.50727.4927 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -22,7 +22,7 @@ Namespace My Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings),MySettings) -#Region "My.Settings Auto-Save Functionality" +#Region "Funktion zum automatischen Speichern von My.Settings" #If _MyType = "WindowsForms" Then Private Shared addedHandler As Boolean @@ -55,7 +55,7 @@ Namespace My End Property _ Public Property MainFormLocation() As Global.System.Drawing.Point @@ -68,7 +68,7 @@ Namespace My End Property _ Public Property MainFormSize() As Global.System.Drawing.Size @@ -81,7 +81,7 @@ Namespace My End Property _ Public Property MainFormState() As Global.System.Windows.Forms.FormWindowState @@ -94,7 +94,7 @@ Namespace My End Property _ Public Property MainFormKiosk() As Boolean @@ -107,7 +107,7 @@ Namespace My End Property _ Public Property DoUpgrade() As Boolean @@ -120,7 +120,7 @@ Namespace My End Property _ Public Property CustomPuttyPath() As String @@ -133,7 +133,7 @@ Namespace My End Property _ Public Property ShowNoMessageBoxes() As Boolean @@ -146,7 +146,7 @@ Namespace My End Property _ Public Property SwitchToMCOnInformation() As Boolean @@ -159,7 +159,7 @@ Namespace My End Property _ Public Property SwitchToMCOnWarning() As Boolean @@ -172,7 +172,7 @@ Namespace My End Property _ Public Property SwitchToMCOnError() As Boolean @@ -185,7 +185,7 @@ Namespace My End Property _ Public Property AutomaticallyGetSessionInfo() As Boolean @@ -198,7 +198,7 @@ Namespace My End Property _ Public Property LoadConsFromCustomLocation() As Boolean @@ -211,7 +211,7 @@ Namespace My End Property _ Public Property CustomConsPath() As String @@ -224,7 +224,7 @@ Namespace My End Property _ Public Property SaveConsOnExit() As Boolean @@ -237,7 +237,7 @@ Namespace My End Property _ Public Property ConfirmExit() As Boolean @@ -250,7 +250,7 @@ Namespace My End Property _ Public Property CheckForUpdatesOnStartup() As Boolean @@ -263,7 +263,7 @@ Namespace My End Property _ Public Property ShowDescriptionTooltipsInTree() As Boolean @@ -276,7 +276,7 @@ Namespace My End Property _ Public Property ShowSystemTrayIcon() As Boolean @@ -289,7 +289,7 @@ Namespace My End Property _ Public Property OpenTabsRightOfSelected() As Boolean @@ -302,7 +302,7 @@ Namespace My End Property _ Public Property ShowLogonInfoOnTabs() As Boolean @@ -315,7 +315,7 @@ Namespace My End Property _ Public Property SingleClickOnConnectionOpensIt() As Boolean @@ -328,7 +328,7 @@ Namespace My End Property _ Public Property EmptyCredentials() As String @@ -341,7 +341,7 @@ Namespace My End Property _ Public Property DefaultUsername() As String @@ -354,7 +354,7 @@ Namespace My End Property _ Public Property DefaultPassword() As String @@ -367,7 +367,7 @@ Namespace My End Property _ Public Property DefaultDomain() As String @@ -380,7 +380,7 @@ Namespace My End Property _ Public Property WriteLogFile() As Boolean @@ -393,7 +393,7 @@ Namespace My End Property _ Public Property UseCustomPuttyPath() As Boolean @@ -406,7 +406,7 @@ Namespace My End Property _ Public Property ShowCompleteConsPathInTitle() As Boolean @@ -419,7 +419,7 @@ Namespace My End Property _ Public Property FirstStart() As Boolean @@ -432,7 +432,7 @@ Namespace My End Property _ Public Property ShowProtocolOnTabs() As Boolean @@ -457,7 +457,7 @@ Namespace My End Property _ Public Property UpdateUseProxy() As Boolean @@ -470,7 +470,7 @@ Namespace My End Property _ Public Property UpdateProxyAddress() As String @@ -483,7 +483,7 @@ Namespace My End Property _ Public Property UpdateProxyPort() As Integer @@ -496,7 +496,7 @@ Namespace My End Property _ Public Property UpdateProxyUseAuthentication() As Boolean @@ -509,7 +509,7 @@ Namespace My End Property _ Public Property UpdateProxyAuthUser() As String @@ -522,7 +522,7 @@ Namespace My End Property _ Public Property UpdateProxyAuthPass() As String @@ -535,7 +535,7 @@ Namespace My End Property _ Public Property ConDefaultDescription() As String @@ -548,7 +548,7 @@ Namespace My End Property _ Public Property ConDefaultIcon() As String @@ -561,7 +561,7 @@ Namespace My End Property _ Public Property ConDefaultPanel() As String @@ -574,7 +574,7 @@ Namespace My End Property _ Public Property ConDefaultUsername() As String @@ -587,7 +587,7 @@ Namespace My End Property _ Public Property ConDefaultPassword() As String @@ -600,7 +600,7 @@ Namespace My End Property _ Public Property ConDefaultDomain() As String @@ -613,7 +613,7 @@ Namespace My End Property _ Public Property ConDefaultProtocol() As String @@ -626,7 +626,7 @@ Namespace My End Property _ Public Property ConDefaultPuttySession() As String @@ -639,7 +639,7 @@ Namespace My End Property _ Public Property ConDefaultUseConsoleSession() As Boolean @@ -652,7 +652,7 @@ Namespace My End Property _ Public Property ConDefaultResolution() As String @@ -665,7 +665,7 @@ Namespace My End Property _ Public Property ConDefaultColors() As String @@ -678,7 +678,7 @@ Namespace My End Property _ Public Property ConDefaultCacheBitmaps() As Boolean @@ -691,7 +691,7 @@ Namespace My End Property _ Public Property ConDefaultDisplayWallpaper() As Boolean @@ -704,7 +704,7 @@ Namespace My End Property _ Public Property ConDefaultDisplayThemes() As Boolean @@ -717,7 +717,7 @@ Namespace My End Property _ Public Property ConDefaultRedirectKeys() As Boolean @@ -730,7 +730,7 @@ Namespace My End Property _ Public Property ConDefaultRedirectDiskDrives() As Boolean @@ -743,7 +743,7 @@ Namespace My End Property _ Public Property ConDefaultRedirectPrinters() As Boolean @@ -756,7 +756,7 @@ Namespace My End Property _ Public Property ConDefaultRedirectPorts() As Boolean @@ -769,7 +769,7 @@ Namespace My End Property _ Public Property ConDefaultRedirectSmartCards() As Boolean @@ -782,7 +782,7 @@ Namespace My End Property _ Public Property ConDefaultRedirectSound() As String @@ -795,7 +795,7 @@ Namespace My End Property _ Public Property MaxPuttyWaitTime() As Integer @@ -808,7 +808,7 @@ Namespace My End Property _ Public Property SingleInstance() As Boolean @@ -821,7 +821,7 @@ Namespace My End Property _ Public Property OpenConsFromLastSession() As Boolean @@ -834,7 +834,7 @@ Namespace My End Property _ Public Property NoReconnect() As Boolean @@ -847,7 +847,7 @@ Namespace My End Property _ Public Property AutoSaveEveryMinutes() As Integer @@ -860,7 +860,7 @@ Namespace My End Property _ Public Property ExtAppsTBVisible() As Boolean @@ -873,7 +873,7 @@ Namespace My End Property _ Public Property ExtAppsTBShowText() As Boolean @@ -886,7 +886,7 @@ Namespace My End Property _ Public Property ExtAppsTBLocation() As Global.System.Drawing.Point @@ -899,7 +899,7 @@ Namespace My End Property _ Public Property ExtAppsTBParentDock() As String @@ -912,7 +912,7 @@ Namespace My End Property _ Public Property QuickyTBVisible() As Boolean @@ -925,7 +925,7 @@ Namespace My End Property _ Public Property QuickyTBLocation() As Global.System.Drawing.Point @@ -938,7 +938,7 @@ Namespace My End Property _ Public Property QuickyTBParentDock() As String @@ -963,7 +963,7 @@ Namespace My End Property _ Public Property UseSQLServer() As Boolean @@ -976,7 +976,7 @@ Namespace My End Property _ Public Property SQLHost() As String @@ -989,7 +989,7 @@ Namespace My End Property _ Public Property SQLUser() As String @@ -1002,7 +1002,7 @@ Namespace My End Property _ Public Property SQLPass() As String @@ -1015,7 +1015,7 @@ Namespace My End Property _ Public Property InhDefaultCacheBitmaps() As Boolean @@ -1028,7 +1028,7 @@ Namespace My End Property _ Public Property InhDefaultColors() As Boolean @@ -1041,7 +1041,7 @@ Namespace My End Property _ Public Property InhDefaultDescription() As Boolean @@ -1054,7 +1054,7 @@ Namespace My End Property _ Public Property InhDefaultDisplayThemes() As Boolean @@ -1067,7 +1067,7 @@ Namespace My End Property _ Public Property InhDefaultDisplayWallpaper() As Boolean @@ -1080,7 +1080,7 @@ Namespace My End Property _ Public Property InhDefaultDomain() As Boolean @@ -1093,7 +1093,7 @@ Namespace My End Property _ Public Property InhDefaultIcon() As Boolean @@ -1106,7 +1106,7 @@ Namespace My End Property _ Public Property InhDefaultPassword() As Boolean @@ -1119,7 +1119,7 @@ Namespace My End Property _ Public Property InhDefaultPort() As Boolean @@ -1132,7 +1132,7 @@ Namespace My End Property _ Public Property InhDefaultProtocol() As Boolean @@ -1145,7 +1145,7 @@ Namespace My End Property _ Public Property InhDefaultPuttySession() As Boolean @@ -1158,7 +1158,7 @@ Namespace My End Property _ Public Property InhDefaultRedirectDiskDrives() As Boolean @@ -1171,7 +1171,7 @@ Namespace My End Property _ Public Property InhDefaultRedirectKeys() As Boolean @@ -1184,7 +1184,7 @@ Namespace My End Property _ Public Property InhDefaultRedirectPorts() As Boolean @@ -1197,7 +1197,7 @@ Namespace My End Property _ Public Property InhDefaultRedirectPrinters() As Boolean @@ -1210,7 +1210,7 @@ Namespace My End Property _ Public Property InhDefaultRedirectSmartCards() As Boolean @@ -1223,7 +1223,7 @@ Namespace My End Property _ Public Property InhDefaultRedirectSound() As Boolean @@ -1236,7 +1236,7 @@ Namespace My End Property _ Public Property InhDefaultResolution() As Boolean @@ -1249,7 +1249,7 @@ Namespace My End Property _ Public Property InhDefaultUseConsoleSession() As Boolean @@ -1262,7 +1262,7 @@ Namespace My End Property _ Public Property InhDefaultUsername() As Boolean @@ -1275,7 +1275,7 @@ Namespace My End Property _ Public Property InhDefaultPanel() As Boolean @@ -1288,7 +1288,7 @@ Namespace My End Property _ Public Property ConDefaultICAEncryptionStrength() As String @@ -1301,7 +1301,7 @@ Namespace My End Property _ Public Property InhDefaultICAEncryptionStrength() As Boolean @@ -1314,7 +1314,7 @@ Namespace My End Property _ Public Property ConDefaultPreExtApp() As String @@ -1327,7 +1327,7 @@ Namespace My End Property _ Public Property ConDefaultPostExtApp() As String @@ -1340,7 +1340,7 @@ Namespace My End Property _ Public Property InhDefaultPreExtApp() As Boolean @@ -1353,7 +1353,7 @@ Namespace My End Property _ Public Property InhDefaultPostExtApp() As Boolean @@ -1366,7 +1366,7 @@ Namespace My End Property _ Public Property SetHostnameLikeDisplayName() As Boolean @@ -1379,7 +1379,7 @@ Namespace My End Property _ Public Property DoubleClickOnTabClosesIt() As Boolean @@ -1392,7 +1392,7 @@ Namespace My End Property _ Public Property ReconnectOnDisconnect() As Boolean @@ -1405,7 +1405,7 @@ Namespace My End Property _ Public Property AlwaysShowPanelSelectionDlg() As Boolean @@ -1418,7 +1418,7 @@ Namespace My End Property _ Public Property ConDefaultVNCAuthMode() As String @@ -1431,7 +1431,7 @@ Namespace My End Property _ Public Property ConDefaultVNCColors() As String @@ -1444,7 +1444,7 @@ Namespace My End Property _ Public Property ConDefaultVNCSmartSizeMode() As String @@ -1457,7 +1457,7 @@ Namespace My End Property _ Public Property ConDefaultVNCViewOnly() As Boolean @@ -1470,7 +1470,7 @@ Namespace My End Property _ Public Property ConDefaultVNCCompression() As String @@ -1483,7 +1483,7 @@ Namespace My End Property _ Public Property ConDefaultVNCEncoding() As String @@ -1496,7 +1496,7 @@ Namespace My End Property _ Public Property ConDefaultVNCProxyIP() As String @@ -1509,7 +1509,7 @@ Namespace My End Property _ Public Property ConDefaultVNCProxyPassword() As String @@ -1522,7 +1522,7 @@ Namespace My End Property _ Public Property ConDefaultVNCProxyPort() As Integer @@ -1535,7 +1535,7 @@ Namespace My End Property _ Public Property ConDefaultVNCProxyType() As String @@ -1548,7 +1548,7 @@ Namespace My End Property _ Public Property ConDefaultVNCProxyUsername() As String @@ -1561,7 +1561,7 @@ Namespace My End Property _ Public Property InhDefaultVNCAuthMode() As Boolean @@ -1574,7 +1574,7 @@ Namespace My End Property _ Public Property InhDefaultVNCColors() As Boolean @@ -1587,7 +1587,7 @@ Namespace My End Property _ Public Property InhDefaultVNCSmartSizeMode() As Boolean @@ -1600,7 +1600,7 @@ Namespace My End Property _ Public Property InhDefaultVNCViewOnly() As Boolean @@ -1613,7 +1613,7 @@ Namespace My End Property _ Public Property InhDefaultVNCCompression() As Boolean @@ -1626,7 +1626,7 @@ Namespace My End Property _ Public Property InhDefaultVNCEncoding() As Boolean @@ -1639,7 +1639,7 @@ Namespace My End Property _ Public Property InhDefaultVNCProxyIP() As Boolean @@ -1652,7 +1652,7 @@ Namespace My End Property _ Public Property InhDefaultVNCProxyPassword() As Boolean @@ -1665,7 +1665,7 @@ Namespace My End Property _ Public Property InhDefaultVNCProxyPort() As Boolean @@ -1678,7 +1678,7 @@ Namespace My End Property _ Public Property InhDefaultVNCProxyType() As Boolean @@ -1691,7 +1691,7 @@ Namespace My End Property _ Public Property InhDefaultVNCProxyUsername() As Boolean @@ -1704,7 +1704,7 @@ Namespace My End Property _ Public Property MinimizeToTray() As Boolean @@ -1717,7 +1717,7 @@ Namespace My End Property _ Public Property SingleClickSwitchesToOpenConnection() As Boolean @@ -1730,7 +1730,7 @@ Namespace My End Property _ Public Property ConDefaultRDPAuthenticationLevel() As String @@ -1743,7 +1743,7 @@ Namespace My End Property _ Public Property InhDefaultRDPAuthenticationLevel() As Boolean @@ -1756,7 +1756,7 @@ Namespace My End Property _ Public Property UVNCSCPort() As Integer @@ -1769,7 +1769,7 @@ Namespace My End Property _ Public Property StartupComponentsCheck() As Boolean @@ -1782,7 +1782,7 @@ Namespace My End Property _ Public Property XULRunnerPath() As String @@ -1795,7 +1795,7 @@ Namespace My End Property _ Public Property ConDefaultRenderingEngine() As String @@ -1808,7 +1808,7 @@ Namespace My End Property _ Public Property InhDefaultRenderingEngine() As Boolean @@ -1821,7 +1821,7 @@ Namespace My End Property _ Public Property ConDefaultMacAddress() As String @@ -1834,7 +1834,7 @@ Namespace My End Property _ Public Property InhDefaultMacAddress() As Boolean @@ -1847,7 +1847,7 @@ Namespace My End Property _ Public Property EncryptCompleteConnectionsFile() As Boolean @@ -1860,7 +1860,7 @@ Namespace My End Property _ Public Property ConDefaultUserField() As String @@ -1873,7 +1873,7 @@ Namespace My End Property _ Public Property InhDefaultUserField() As Boolean @@ -1886,7 +1886,7 @@ Namespace My End Property _ Public Property ConDefaultExtApp() As String @@ -1899,7 +1899,7 @@ Namespace My End Property _ Public Property InhDefaultExtApp() As Boolean @@ -1912,7 +1912,7 @@ Namespace My End Property _ Public Property LastAnnouncement() As String @@ -1925,7 +1925,7 @@ Namespace My End Property _ Public Property CheckForUpdatesAsked() As Boolean @@ -1938,7 +1938,7 @@ Namespace My End Property _ Public Property CheckForUpdatesFrequencyDays() As Integer @@ -1951,7 +1951,7 @@ Namespace My End Property _ Public Property CheckForUpdatesLastCheck() As Date @@ -1964,7 +1964,7 @@ Namespace My End Property _ Public Property UpdatePending() As Boolean @@ -2004,9 +2004,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.mRemote.My.MySettings + Friend ReadOnly Property Settings() As Global.mRemoteNG.My.MySettings Get - Return Global.mRemote.My.MySettings.Default + Return Global.mRemoteNG.My.MySettings.Default End Get End Property End Module diff --git a/mRemoteV1/My Project/Settings.settings b/mRemoteV1/My Project/Settings.settings index 1a14f8d9..a7d568d2 100644 --- a/mRemoteV1/My Project/Settings.settings +++ b/mRemoteV1/My Project/Settings.settings @@ -2,448 +2,448 @@ - + 999, 999 - + 900, 600 - + Normal - + False - + True - + - + True - + True - + True - + True - + True - + False - + - + True - + True - + True - + False - + False - + True - + False - + False - + noinfo - + - + - + - + False - + False - + False - + True - + False False - + False - + - + 80 - + False - + - + - + - + mRemote - + General - + - + - + - + RDP - + Default Settings - + False - + FitToWindow - + Colors16Bit - + True - + False - + False - + False - + False - + False - + False - + False - + DoNotPlay - + 2 - + False - + False - + False - + 0 - + False - + True - + 0, 0 - + Bottom - + True - + 3, 24 - + Top False - + False - + - + - + - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + EncrBasic - + False - + - + - + False - + False - + False - + True - + False - + False - + AuthVNC - + ColNormal - + SmartSAspect - + False - + CompNone - + EncHextile - + - + - + 0 - + ProxyNone - + - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + NoAuth - + False - + 5500 - + True - + - + IE - + False - + - + False - + False - + - + False - + - + False - + - + False - + 7 - + 1980-01-01 - + False diff --git a/mRemoteV1/Root/Root.Info.vb b/mRemoteV1/Root/Root.Info.vb index 92b646fa..0bdb75ce 100644 --- a/mRemoteV1/Root/Root.Info.vb +++ b/mRemoteV1/Root/Root.Info.vb @@ -1,6 +1,6 @@ Imports System.Windows.Forms Imports System.ComponentModel -Imports mRemote.Tools.LocalizedAttributes +Imports mRemoteNG.Tools.LocalizedAttributes Namespace Root _ @@ -38,7 +38,7 @@ Namespace Root DesignOnly(False), _ LocalizedDisplayName("strPasswordProtect"), _ Attributes.Root(), _ - TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _ + TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _ Public Property Password() As Boolean Get Return _Password diff --git a/mRemoteV1/Security/Security.Crypt.vb b/mRemoteV1/Security/Security.Crypt.vb index dfc0fc43..8c580caa 100644 --- a/mRemoteV1/Security/Security.Crypt.vb +++ b/mRemoteV1/Security/Security.Crypt.vb @@ -1,7 +1,7 @@ Imports System.IO Imports System.Security.Cryptography Imports System.Text -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Security Public Class Crypt diff --git a/mRemoteV1/Security/Security.Impersonator.vb b/mRemoteV1/Security/Security.Impersonator.vb index 25c85308..b4269b88 100644 --- a/mRemoteV1/Security/Security.Impersonator.vb +++ b/mRemoteV1/Security/Security.Impersonator.vb @@ -1,7 +1,7 @@ Imports System.Runtime.InteropServices Imports System.Security.Principal Imports System.Security.Permissions -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime diff --git a/mRemoteV1/Tools/ReconnectGroup.Designer.vb b/mRemoteV1/Tools/ReconnectGroup.Designer.vb index 90c12e86..15d0f600 100644 --- a/mRemoteV1/Tools/ReconnectGroup.Designer.vb +++ b/mRemoteV1/Tools/ReconnectGroup.Designer.vb @@ -89,7 +89,7 @@ Partial Class ReconnectGroup ' 'pbServerStatus ' - Me.pbServerStatus.Image = Global.mRemote.My.Resources.Resources.HostStatus_Check + Me.pbServerStatus.Image = Global.mRemoteNG.My.Resources.Resources.HostStatus_Check Me.pbServerStatus.Location = New System.Drawing.Point(99, 23) Me.pbServerStatus.Name = "pbServerStatus" Me.pbServerStatus.Size = New System.Drawing.Size(16, 16) diff --git a/mRemoteV1/Tools/Tools.Controls.vb b/mRemoteV1/Tools/Tools.Controls.vb index e07aaaac..9ffef4f1 100644 --- a/mRemoteV1/Tools/Tools.Controls.vb +++ b/mRemoteV1/Tools/Tools.Controls.vb @@ -1,5 +1,5 @@ Imports System.Windows.Forms -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace Tools Public Class Controls @@ -164,7 +164,7 @@ Namespace Tools Private Sub ConMenItem_MouseDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs) If e.Button = MouseButtons.Left Then - If TypeOf sender.Tag Is mRemote.Connection.Info Then + If TypeOf sender.Tag Is mRemoteNG.Connection.Info Then If frmMain.Visible = False Then ShowForm() End If diff --git a/mRemoteV1/Tools/Tools.ExternalApp.vb b/mRemoteV1/Tools/Tools.ExternalApp.vb index 6b600d04..6bb9336f 100644 --- a/mRemoteV1/Tools/Tools.ExternalApp.vb +++ b/mRemoteV1/Tools/Tools.ExternalApp.vb @@ -1,4 +1,4 @@ -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.IO Imports System.ComponentModel diff --git a/mRemoteV1/Tools/Tools.Misc.vb b/mRemoteV1/Tools/Tools.Misc.vb index 165f52bc..a1bc156c 100644 --- a/mRemoteV1/Tools/Tools.Misc.vb +++ b/mRemoteV1/Tools/Tools.Misc.vb @@ -1,10 +1,9 @@ Imports System.Reflection Imports System.ComponentModel -Imports System.Drawing.Design Imports System.Runtime.InteropServices Imports System.Collections.Specialized Imports System.Text.RegularExpressions -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.IO Imports System.Data.SqlClient diff --git a/mRemoteV1/Tools/Tools.PortScan.vb b/mRemoteV1/Tools/Tools.PortScan.vb index a3a0e834..84426d99 100644 --- a/mRemoteV1/Tools/Tools.PortScan.vb +++ b/mRemoteV1/Tools/Tools.PortScan.vb @@ -1,5 +1,5 @@ Imports System.Threading -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Net.NetworkInformation Namespace Tools diff --git a/mRemoteV1/Tree/Tree.Node.vb b/mRemoteV1/Tree/Tree.Node.vb index 9194f8fb..84c313e2 100644 --- a/mRemoteV1/Tree/Tree.Node.vb +++ b/mRemoteV1/Tree/Tree.Node.vb @@ -1,5 +1,5 @@ Imports System.Windows.Forms -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.DirectoryServices Namespace Tree @@ -46,9 +46,9 @@ Namespace Tree Public Shared Function GetConstantID(ByVal node As TreeNode) As String Select Case GetNodeType(node) Case Type.Connection - Return TryCast(node.Tag, mRemote.Connection.Info).ConstantID + Return TryCast(node.Tag, mRemoteNG.Connection.Info).ConstantID Case Type.Container - Return TryCast(node.Tag, mRemote.Container.Info).ConnectionInfo.ConstantID + Return TryCast(node.Tag, mRemoteNG.Container.Info).ConnectionInfo.ConstantID End Select Return Nothing @@ -214,9 +214,9 @@ Namespace Tree Try Dim adCNode As TreeNode = Tree.Node.AddNode(Type.Container) - Dim nContI As New mRemote.Container.Info() + Dim nContI As New mRemoteNG.Container.Info() nContI.TreeNode = adCNode - nContI.ConnectionInfo = New mRemote.Connection.Info(nContI) + nContI.ConnectionInfo = New mRemoteNG.Connection.Info(nContI) If Tree.Node.SelectedNode IsNot Nothing Then If Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.Container Then @@ -274,10 +274,10 @@ Namespace Tree Dim adNode As TreeNode = Tree.Node.AddNode(Type.Connection, strDisplayName) - Dim nConI As New mRemote.Connection.Info() - Dim nInh As New mRemote.Connection.Info.Inheritance(nConI, True) + Dim nConI As New mRemoteNG.Connection.Info() + Dim nInh As New mRemoteNG.Connection.Info.Inheritance(nConI, True) nInh.Description = False - If TypeOf rNode.Tag Is mRemote.Container.Info Then + If TypeOf rNode.Tag Is mRemoteNG.Container.Info Then nConI.Parent = rNode.Tag End If nConI.Inherit = nInh @@ -343,7 +343,7 @@ Namespace Tree End If Catch ex As Exception mC.AddMessage(Messages.MessageClass.WarningMsg, "CloneNode failed (Tree.Node)" & vbNewLine & ex.Message) - End Try + End Try End Sub Public Shared Sub SetNodeImage(ByVal treeNode As TreeNode, ByVal Img As Images.Enums.TreeImage) @@ -376,7 +376,7 @@ Namespace Tree Else 'Get this node's object data. If GetNodeType(old_node) = Type.Connection Then - tTip.SetToolTip(_TreeView, TryCast(old_node.Tag, mRemote.Connection.Info).Description) + tTip.SetToolTip(_TreeView, TryCast(old_node.Tag, mRemoteNG.Connection.Info).Description) End If End If End If diff --git a/mRemoteV1/UI/UI.Window.ADImport.vb b/mRemoteV1/UI/UI.Window.ADImport.vb index 1f5177b7..78a2f905 100644 --- a/mRemoteV1/UI/UI.Window.ADImport.vb +++ b/mRemoteV1/UI/UI.Window.ADImport.vb @@ -30,7 +30,7 @@ Namespace UI Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(75, 23) Me.btnOK.TabIndex = 100 - Me.btnOK.Text = Global.mRemote.My.Resources.Resources.strButtonOK + Me.btnOK.Text = Global.mRemoteNG.My.Resources.Resources.strButtonOK Me.btnOK.UseVisualStyleBackColor = True ' 'btnCancel @@ -42,7 +42,7 @@ Namespace UI Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(75, 23) Me.btnCancel.TabIndex = 110 - Me.btnCancel.Text = Global.mRemote.My.Resources.Resources.strButtonCancel + Me.btnCancel.Text = Global.mRemoteNG.My.Resources.Resources.strButtonCancel Me.btnCancel.UseVisualStyleBackColor = True ' 'txtDomain @@ -72,7 +72,7 @@ Namespace UI Me.btnChangeDomain.Name = "btnChangeDomain" Me.btnChangeDomain.Size = New System.Drawing.Size(75, 23) Me.btnChangeDomain.TabIndex = 40 - Me.btnChangeDomain.Text = Global.mRemote.My.Resources.Resources.strButtonChange + Me.btnChangeDomain.Text = Global.mRemoteNG.My.Resources.Resources.strButtonChange Me.btnChangeDomain.UseVisualStyleBackColor = True ' 'AD @@ -100,7 +100,7 @@ Namespace UI Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnOK) Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = Global.mRemote.My.Resources.Resources.ActiveDirectory_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.ActiveDirectory_Icon Me.Name = "ADImport" Me.TabText = "Active Directory Import" Me.Text = "Active Directory Import" @@ -145,7 +145,7 @@ Namespace UI Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click Me._ADPath = Me.AD.ADPath - mRemote.Tree.Node.AddADNodes(Me._ADPath) + mRemoteNG.Tree.Node.AddADNodes(Me._ADPath) Me.DialogResult = Windows.Forms.DialogResult.OK Me.Close() End Sub diff --git a/mRemoteV1/UI/UI.Window.About.vb b/mRemoteV1/UI/UI.Window.About.vb index acafff23..2a5dc097 100644 --- a/mRemoteV1/UI/UI.Window.About.vb +++ b/mRemoteV1/UI/UI.Window.About.vb @@ -1,6 +1,6 @@ Imports WeifenLuo.WinFormsUI.Docking Imports System.IO -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -68,7 +68,7 @@ Namespace UI ' 'pbLogo ' - Me.pbLogo.Image = Global.mRemote.My.Resources.Resources.Logo + Me.pbLogo.Image = Global.mRemoteNG.My.Resources.Resources.Logo Me.pbLogo.Location = New System.Drawing.Point(8, 8) Me.pbLogo.Name = "pbLogo" Me.pbLogo.Size = New System.Drawing.Size(492, 128) @@ -211,7 +211,7 @@ Namespace UI Me.Controls.Add(Me.pnlBottom) Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ForeColor = System.Drawing.SystemColors.ControlText - Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon Me.MaximumSize = New System.Drawing.Size(20000, 10000) Me.Name = "About" Me.TabText = "About" diff --git a/mRemoteV1/UI/UI.Window.Announcment.vb b/mRemoteV1/UI/UI.Window.Announcment.vb index 75a46214..5af28de7 100644 --- a/mRemoteV1/UI/UI.Window.Announcment.vb +++ b/mRemoteV1/UI/UI.Window.Announcment.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Threading Namespace UI diff --git a/mRemoteV1/UI/UI.Window.Base.vb b/mRemoteV1/UI/UI.Window.Base.vb index 0ad28603..1bd33644 100644 --- a/mRemoteV1/UI/UI.Window.Base.vb +++ b/mRemoteV1/UI/UI.Window.Base.vb @@ -1,4 +1,3 @@ -Imports System.Windows.Forms Imports WeifenLuo.WinFormsUI.Docking Namespace UI diff --git a/mRemoteV1/UI/UI.Window.ComponentsCheck.vb b/mRemoteV1/UI/UI.Window.ComponentsCheck.vb index a6d8dd9b..4ea73fb9 100644 --- a/mRemoteV1/UI/UI.Window.ComponentsCheck.vb +++ b/mRemoteV1/UI/UI.Window.ComponentsCheck.vb @@ -1,6 +1,6 @@ Imports WeifenLuo.WinFormsUI.Docking Imports System.IO -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.Threading Namespace UI @@ -415,7 +415,7 @@ Namespace UI Me.Controls.Add(Me.pnlChecks) Me.Controls.Add(Me.chkAlwaysShow) Me.Controls.Add(Me.btnCheckAgain) - Me.Icon = Global.mRemote.My.Resources.Resources.ComponentsCheck_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.ComponentsCheck_Icon Me.Name = "ComponentsCheck" Me.TabText = "Components Check" Me.Text = "Components Check" @@ -647,7 +647,7 @@ Namespace UI End Try End Sub #End Region - + End Class End Namespace End Namespace \ No newline at end of file diff --git a/mRemoteV1/UI/UI.Window.Config.vb b/mRemoteV1/UI/UI.Window.Config.vb index 7415b8e6..182fdc7b 100644 --- a/mRemoteV1/UI/UI.Window.Config.vb +++ b/mRemoteV1/UI/UI.Window.Config.vb @@ -1,6 +1,6 @@ Imports WeifenLuo.WinFormsUI.Docking Imports System.Net.NetworkInformation -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -49,7 +49,7 @@ Namespace UI 'btnShowInheritance ' Me.btnShowInheritance.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnShowInheritance.Image = Global.mRemote.My.Resources.Resources.Inheritance + Me.btnShowInheritance.Image = Global.mRemoteNG.My.Resources.Resources.Inheritance Me.btnShowInheritance.ImageTransparentColor = System.Drawing.Color.Magenta Me.btnShowInheritance.Name = "btnShowInheritance" Me.btnShowInheritance.Size = New System.Drawing.Size(23, 22) @@ -58,7 +58,7 @@ Namespace UI 'btnShowDefaultInheritance ' Me.btnShowDefaultInheritance.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnShowDefaultInheritance.Image = Global.mRemote.My.Resources.Resources.Inheritance_Default + Me.btnShowDefaultInheritance.Image = Global.mRemoteNG.My.Resources.Resources.Inheritance_Default Me.btnShowDefaultInheritance.ImageTransparentColor = System.Drawing.Color.Magenta Me.btnShowDefaultInheritance.Name = "btnShowDefaultInheritance" Me.btnShowDefaultInheritance.Size = New System.Drawing.Size(23, 22) @@ -69,7 +69,7 @@ Namespace UI Me.btnShowProperties.Checked = True Me.btnShowProperties.CheckState = System.Windows.Forms.CheckState.Checked Me.btnShowProperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnShowProperties.Image = Global.mRemote.My.Resources.Resources.Properties + Me.btnShowProperties.Image = Global.mRemoteNG.My.Resources.Resources.Properties Me.btnShowProperties.ImageTransparentColor = System.Drawing.Color.Magenta Me.btnShowProperties.Name = "btnShowProperties" Me.btnShowProperties.Size = New System.Drawing.Size(23, 22) @@ -78,7 +78,7 @@ Namespace UI 'btnShowDefaultProperties ' Me.btnShowDefaultProperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnShowDefaultProperties.Image = Global.mRemote.My.Resources.Resources.Properties_Default + Me.btnShowDefaultProperties.Image = Global.mRemoteNG.My.Resources.Resources.Properties_Default Me.btnShowDefaultProperties.ImageTransparentColor = System.Drawing.Color.Magenta Me.btnShowDefaultProperties.Name = "btnShowDefaultProperties" Me.btnShowDefaultProperties.Size = New System.Drawing.Size(23, 22) @@ -97,7 +97,7 @@ Namespace UI ' Me.btnHostStatus.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.btnHostStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - Me.btnHostStatus.Image = Global.mRemote.My.Resources.Resources.HostStatus_Check + Me.btnHostStatus.Image = Global.mRemoteNG.My.Resources.Resources.HostStatus_Check Me.btnHostStatus.ImageTransparentColor = System.Drawing.Color.Magenta Me.btnHostStatus.Name = "btnHostStatus" Me.btnHostStatus.Size = New System.Drawing.Size(23, 22) @@ -114,7 +114,7 @@ Namespace UI Me.ClientSize = New System.Drawing.Size(226, 530) Me.Controls.Add(Me.pGrid) Me.HideOnClose = True - Me.Icon = Global.mRemote.My.Resources.Resources.Config_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Config_Icon Me.Name = "Config" Me.TabText = "Config" Me.Text = "Config" @@ -262,13 +262,13 @@ Namespace UI Me.btnIcon.Image = Nothing - If TypeOf Obj Is mRemote.Connection.Info Then 'CONNECTION INFO - If TryCast(Obj, mRemote.Connection.Info).IsContainer = False Then 'NO CONTAINER + If TypeOf Obj Is mRemoteNG.Connection.Info Then 'CONNECTION INFO + If TryCast(Obj, mRemoteNG.Connection.Info).IsContainer = False Then 'NO CONTAINER If Me.PropertiesVisible Then 'Properties selected Me.pGrid.SelectedObject = Obj Me.btnShowProperties.Enabled = True - If TryCast(Obj, mRemote.Connection.Info).Parent IsNot Nothing Then + If TryCast(Obj, mRemoteNG.Connection.Info).Parent IsNot Nothing Then Me.btnShowInheritance.Enabled = True Else Me.btnShowInheritance.Enabled = False @@ -280,7 +280,7 @@ Namespace UI ElseIf Me.DefaultPropertiesVisible Then 'Defaults selected Me.pGrid.SelectedObject = Obj - If TryCast(Obj, mRemote.Connection.Info).IsDefault Then 'Is the default connection + If TryCast(Obj, mRemoteNG.Connection.Info).IsDefault Then 'Is the default connection Me.btnShowProperties.Enabled = True Me.btnShowInheritance.Enabled = False Me.btnShowDefaultProperties.Enabled = True @@ -298,7 +298,7 @@ Namespace UI Me.PropertiesVisible = True End If ElseIf Me.InheritanceVisible Then 'Inheritance selected - Me.pGrid.SelectedObject = TryCast(Obj, mRemote.Connection.Info).Inherit + Me.pGrid.SelectedObject = TryCast(Obj, mRemoteNG.Connection.Info).Inherit Me.btnShowProperties.Enabled = True Me.btnShowInheritance.Enabled = True @@ -316,11 +316,11 @@ Namespace UI Me.PropertiesVisible = True End If - ElseIf TryCast(Obj, mRemote.Connection.Info).IsContainer Then 'CONTAINER + ElseIf TryCast(Obj, mRemoteNG.Connection.Info).IsContainer Then 'CONTAINER Me.pGrid.SelectedObject = Obj Me.btnShowProperties.Enabled = True - If TryCast(TryCast(Obj, mRemote.Connection.Info).Parent, mRemote.Container.Info).Parent IsNot Nothing Then + If TryCast(TryCast(Obj, mRemoteNG.Connection.Info).Parent, mRemoteNG.Container.Info).Parent IsNot Nothing Then Me.btnShowInheritance.Enabled = True Else Me.btnShowInheritance.Enabled = False @@ -333,11 +333,11 @@ Namespace UI Me.PropertiesVisible = True End If - Dim conIcon As Icon = mRemote.Connection.Icon.FromString(TryCast(Obj, mRemote.Connection.Info).Icon) + Dim conIcon As Icon = mRemoteNG.Connection.Icon.FromString(TryCast(Obj, mRemoteNG.Connection.Info).Icon) If conIcon IsNot Nothing Then Me.btnIcon.Image = conIcon.ToBitmap End If - ElseIf TypeOf Obj Is mRemote.Root.Info Then 'ROOT + ElseIf TypeOf Obj Is mRemoteNG.Root.Info Then 'ROOT Me.PropertiesVisible = True Me.DefaultPropertiesVisible = False Me.btnShowProperties.Enabled = True @@ -348,7 +348,7 @@ Namespace UI Me.btnHostStatus.Enabled = False Me.pGrid.SelectedObject = Obj - ElseIf TypeOf Obj Is mRemote.Connection.Info.Inheritance Then 'INHERITANCE + ElseIf TypeOf Obj Is mRemoteNG.Connection.Info.Inheritance Then 'INHERITANCE Me.pGrid.SelectedObject = Obj If Me.InheritanceVisible Then @@ -358,11 +358,11 @@ Namespace UI Me.btnShowDefaultProperties.Enabled = False Me.btnShowDefaultInheritance.Enabled = False Me.btnIcon.Enabled = True - Me.btnHostStatus.Enabled = Not TryCast(TryCast(Obj, mRemote.Connection.Info.Inheritance).Parent, mRemote.Connection.Info).IsContainer + Me.btnHostStatus.Enabled = Not TryCast(TryCast(Obj, mRemoteNG.Connection.Info.Inheritance).Parent, mRemoteNG.Connection.Info).IsContainer Me.InheritanceVisible = True - Dim conIcon As Icon = mRemote.Connection.Icon.FromString(TryCast(TryCast(Obj, mRemote.Connection.Info.Inheritance).Parent, mRemote.Connection.Info).Icon) + Dim conIcon As Icon = mRemoteNG.Connection.Icon.FromString(TryCast(TryCast(Obj, mRemoteNG.Connection.Info.Inheritance).Parent, mRemoteNG.Connection.Info).Icon) If conIcon IsNot Nothing Then Me.btnIcon.Image = conIcon.ToBitmap End If @@ -374,7 +374,7 @@ Namespace UI Me.btnIcon.Enabled = False Me.btnHostStatus.Enabled = False - Me.DefaultInheritanceVisible = True + Me.DefaultInheritanceVisible = True End If End If @@ -440,30 +440,30 @@ Namespace UI Private Sub pGrid_PropertyValueChanged(ByVal s As Object, ByVal e As System.Windows.Forms.PropertyValueChangedEventArgs) Handles pGrid.PropertyValueChanged Try - If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then Select Case e.ChangedItem.Label Case My.Resources.strPropertyNameProtocol - TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).SetDefaultPort() + TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info).SetDefaultPort() Case My.Resources.strPropertyNameName App.Runtime.Windows.treeForm.tvConnections.SelectedNode.Text = Me.pGrid.SelectedObject.Name Case My.Resources.strPropertyNameIcon - Dim conIcon As Icon = mRemote.Connection.Icon.FromString(TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).Icon) + Dim conIcon As Icon = mRemoteNG.Connection.Icon.FromString(TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info).Icon) If conIcon IsNot Nothing Then Me.btnIcon.Image = conIcon.ToBitmap End If Case My.Resources.strPropertyNamePuttySession - mRemote.Connection.PuttySession.PuttySessions = mRemote.Connection.Protocol.PuttyBase.GetSessions() + mRemoteNG.Connection.PuttySession.PuttySessions = mRemoteNG.Connection.Protocol.PuttyBase.GetSessions() Case My.Resources.strPropertyNameAddress Me.SetHostStatus(Me.pGrid.SelectedObject) End Select - If TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).IsDefault Then + If TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info).IsDefault Then App.Runtime.DefaultConnectionToSettings() End If End If - If TypeOf Me.pGrid.SelectedObject Is mRemote.Root.Info Then - Dim rInfo As mRemote.Root.Info = Me.pGrid.SelectedObject + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Root.Info Then + Dim rInfo As mRemoteNG.Root.Info = Me.pGrid.SelectedObject Select Case e.ChangedItem.Label Case My.Resources.strPasswordProtect @@ -481,8 +481,8 @@ Namespace UI End Select End If - If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info.Inheritance Then - If TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info.Inheritance).IsDefault Then + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info.Inheritance Then + If TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info.Inheritance).IsDefault Then App.Runtime.DefaultInheritanceToSettings() End If End If @@ -498,42 +498,42 @@ Namespace UI Try Dim strHide As String = "" - If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then - Dim conI As mRemote.Connection.Info = pGrid.SelectedObject + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then + Dim conI As mRemoteNG.Connection.Info = pGrid.SelectedObject Select Case conI.Protocol - Case mRemote.Connection.Protocol.Protocols.RDP + Case mRemoteNG.Connection.Protocol.Protocols.RDP strHide &= "ExtApp;RenderingEngine;PuttySession;ICAEncryption;VNCAuthMode;VNCColors;VNCCompression;VNCEncoding;VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyType;VNCProxyUsername;VNCSmartSizeMode;VNCViewOnly;" - If conI.RDGatewayUsageMethod = mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod.Never Then + If conI.RDGatewayUsageMethod = mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod.Never Then strHide &= "RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;" - Else If conI.RDGatewayUseConnectionCredentials Then + ElseIf conI.RDGatewayUseConnectionCredentials Then strHide &= "RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;" End If - Case mRemote.Connection.Protocol.Protocols.VNC + 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;" - If conI.VNCAuthMode = mRemote.Connection.Protocol.VNC.AuthMode.AuthVNC Then + If conI.VNCAuthMode = mRemoteNG.Connection.Protocol.VNC.AuthMode.AuthVNC Then strHide &= "Username;Domain;" End If - If conI.VNCProxyType = mRemote.Connection.Protocol.VNC.ProxyType.ProxyNone Then + If conI.VNCProxyType = mRemoteNG.Connection.Protocol.VNC.ProxyType.ProxyNone Then strHide &= "VNCProxyIP;VNCProxyPassword;VNCProxyPort;VNCProxyUsername;" End If - Case mRemote.Connection.Protocol.Protocols.SSH1 + 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;" - Case mRemote.Connection.Protocol.Protocols.SSH2 + 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;" - Case mRemote.Connection.Protocol.Protocols.Telnet + 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;" - Case mRemote.Connection.Protocol.Protocols.Rlogin + 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;" - Case mRemote.Connection.Protocol.Protocols.RAW + 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;" - Case mRemote.Connection.Protocol.Protocols.HTTP + 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;" - Case mRemote.Connection.Protocol.Protocols.HTTPS + 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;" - Case mRemote.Connection.Protocol.Protocols.ICA + 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;" - Case mRemote.Connection.Protocol.Protocols.IntApp + 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;" End Select @@ -710,7 +710,7 @@ Namespace UI Else strHide = "Hostname;Name;" End If - ElseIf TypeOf Me.pGrid.SelectedObject Is mRemote.Root.Info Then + ElseIf TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Root.Info Then strHide &= "TreeNode;" Else strHide = ";" @@ -725,33 +725,33 @@ Namespace UI End Sub Private Sub btnShowProperties_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles btnShowProperties.Click - If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info.Inheritance Then - If TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info.Inheritance).IsDefault Then + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info.Inheritance Then + If TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info.Inheritance).IsDefault Then Me.PropertiesVisible = True Me.InheritanceVisible = False Me.DefaultPropertiesVisible = False Me.DefaultInheritanceVisible = False - Me.SetPropertyGridObject(TryCast(App.Runtime.Windows.treeForm.tvConnections.SelectedNode.Tag, mRemote.Root.Info)) + Me.SetPropertyGridObject(TryCast(App.Runtime.Windows.treeForm.tvConnections.SelectedNode.Tag, mRemoteNG.Root.Info)) Else Me.PropertiesVisible = True Me.InheritanceVisible = False Me.DefaultPropertiesVisible = False Me.DefaultInheritanceVisible = False - Me.SetPropertyGridObject(TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info.Inheritance).Parent) + Me.SetPropertyGridObject(TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info.Inheritance).Parent) End If - ElseIf TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then - If TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).IsDefault Then + ElseIf TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then + If TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info).IsDefault Then Me.PropertiesVisible = True Me.InheritanceVisible = False Me.DefaultPropertiesVisible = False Me.DefaultInheritanceVisible = False - Me.SetPropertyGridObject(TryCast(App.Runtime.Windows.treeForm.tvConnections.SelectedNode.Tag, mRemote.Root.Info)) + Me.SetPropertyGridObject(TryCast(App.Runtime.Windows.treeForm.tvConnections.SelectedNode.Tag, mRemoteNG.Root.Info)) End If End If End Sub Private Sub btnShowDefaultProperties_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles btnShowDefaultProperties.Click - If TypeOf Me.pGrid.SelectedObject Is mRemote.Root.Info Or TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info.Inheritance Then + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Root.Info Or TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info.Inheritance Then Me.PropertiesVisible = False Me.InheritanceVisible = False Me.DefaultPropertiesVisible = True @@ -761,17 +761,17 @@ Namespace UI End Sub Private Sub btnShowInheritance_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles btnShowInheritance.Click - If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then Me.PropertiesVisible = False Me.InheritanceVisible = True Me.DefaultPropertiesVisible = False Me.DefaultInheritanceVisible = False - Me.SetPropertyGridObject(TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).Inherit) + Me.SetPropertyGridObject(TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info).Inherit) End If End Sub Private Sub btnShowDefaultInheritance_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles btnShowDefaultInheritance.Click - If TypeOf Me.pGrid.SelectedObject Is mRemote.Root.Info Or TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Root.Info Or TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then Me.PropertiesVisible = False Me.InheritanceVisible = False Me.DefaultPropertiesVisible = False @@ -786,13 +786,13 @@ Namespace UI Private Sub btnIcon_Click(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles btnIcon.MouseUp Try - If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then Me.cMenIcons.Items.Clear() - For Each iStr As String In mRemote.Connection.Icon.Icons + For Each iStr As String In mRemoteNG.Connection.Icon.Icons Dim tI As New ToolStripMenuItem tI.Text = iStr - tI.Image = mRemote.Connection.Icon.FromString(iStr).ToBitmap + tI.Image = mRemoteNG.Connection.Icon.FromString(iStr).ToBitmap AddHandler tI.Click, AddressOf IconMenu_Click Me.cMenIcons.Items.Add(tI) @@ -808,9 +808,9 @@ Namespace UI Private Sub IconMenu_Click(ByVal sender As Object, ByVal e As System.EventArgs) Try - If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then - TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).Icon = TryCast(sender, ToolStripMenuItem).Text - Dim conIcon As Icon = mRemote.Connection.Icon.FromString(TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).Icon) + If TypeOf Me.pGrid.SelectedObject Is mRemoteNG.Connection.Info Then + TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info).Icon = TryCast(sender, ToolStripMenuItem).Text + Dim conIcon As Icon = mRemoteNG.Connection.Icon.FromString(TryCast(Me.pGrid.SelectedObject, mRemoteNG.Connection.Info).Icon) If conIcon IsNot Nothing Then Me.btnIcon.Image = conIcon.ToBitmap End If @@ -863,23 +863,23 @@ Namespace UI Public Sub SetHostStatus(ByVal ConnectionInfo As Object) Try - If TypeOf ConnectionInfo Is mRemote.Connection.Info Then + If TypeOf ConnectionInfo Is mRemoteNG.Connection.Info Then 'continue - ElseIf TypeOf ConnectionInfo Is mRemote.Connection.Info.Inheritance Then - ConnectionInfo = TryCast(ConnectionInfo, mRemote.Connection.Info.Inheritance).Parent + ElseIf TypeOf ConnectionInfo Is mRemoteNG.Connection.Info.Inheritance Then + ConnectionInfo = TryCast(ConnectionInfo, mRemoteNG.Connection.Info.Inheritance).Parent Else Me.btnHostStatus.Image = My.Resources.HostStatus_Check Exit Sub End If - If TryCast(ConnectionInfo, mRemote.Connection.Info).IsContainer Then + If TryCast(ConnectionInfo, mRemoteNG.Connection.Info).IsContainer Then Me.btnHostStatus.Image = My.Resources.HostStatus_Check Exit Sub End If Me.btnHostStatus.Image = My.Resources.HostStatus_Check Me.btnHostStatus.Tag = "checking" - HostName = TryCast(ConnectionInfo, mRemote.Connection.Info).Hostname + HostName = TryCast(ConnectionInfo, mRemoteNG.Connection.Info).Hostname pThread = New Threading.Thread(AddressOf CheckHostAlive) pThread.IsBackground = True pThread.Start() diff --git a/mRemoteV1/UI/UI.Window.Connection.vb b/mRemoteV1/UI/UI.Window.Connection.vb index 8e95abd3..56d3b030 100644 --- a/mRemoteV1/UI/UI.Window.Connection.vb +++ b/mRemoteV1/UI/UI.Window.Connection.vb @@ -3,7 +3,7 @@ Imports System.Windows Imports System.Windows.Forms Imports Crownwood Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -82,14 +82,14 @@ Namespace UI ' 'cmenTabFullscreen ' - Me.cmenTabFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen + Me.cmenTabFullscreen.Image = Global.mRemoteNG.My.Resources.Resources.Fullscreen Me.cmenTabFullscreen.Name = "cmenTabFullscreen" Me.cmenTabFullscreen.Size = New System.Drawing.Size(201, 22) Me.cmenTabFullscreen.Text = "Fullscreen (RDP)" ' 'cmenTabSmartSize ' - Me.cmenTabSmartSize.Image = Global.mRemote.My.Resources.Resources.SmartSize + Me.cmenTabSmartSize.Image = Global.mRemoteNG.My.Resources.Resources.SmartSize Me.cmenTabSmartSize.Name = "cmenTabSmartSize" Me.cmenTabSmartSize.Size = New System.Drawing.Size(201, 22) Me.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)" @@ -107,14 +107,14 @@ Namespace UI ' 'cmenTabScreenshot ' - Me.cmenTabScreenshot.Image = Global.mRemote.My.Resources.Resources.Screenshot_Add + Me.cmenTabScreenshot.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Add Me.cmenTabScreenshot.Name = "cmenTabScreenshot" Me.cmenTabScreenshot.Size = New System.Drawing.Size(201, 22) Me.cmenTabScreenshot.Text = "Screenshot" ' 'cmenTabStartChat ' - Me.cmenTabStartChat.Image = Global.mRemote.My.Resources.Resources.Chat + Me.cmenTabStartChat.Image = Global.mRemoteNG.My.Resources.Resources.Chat Me.cmenTabStartChat.Name = "cmenTabStartChat" Me.cmenTabStartChat.Size = New System.Drawing.Size(201, 22) Me.cmenTabStartChat.Text = "Start Chat (VNC)" @@ -122,14 +122,14 @@ Namespace UI ' 'cmenTabTransferFile ' - Me.cmenTabTransferFile.Image = Global.mRemote.My.Resources.Resources.SSHTransfer + Me.cmenTabTransferFile.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer Me.cmenTabTransferFile.Name = "cmenTabTransferFile" Me.cmenTabTransferFile.Size = New System.Drawing.Size(201, 22) Me.cmenTabTransferFile.Text = "Transfer File (SSH)" ' 'cmenTabRefreshScreen ' - Me.cmenTabRefreshScreen.Image = Global.mRemote.My.Resources.Resources.Refresh + Me.cmenTabRefreshScreen.Image = Global.mRemoteNG.My.Resources.Resources.Refresh Me.cmenTabRefreshScreen.Name = "cmenTabRefreshScreen" Me.cmenTabRefreshScreen.Size = New System.Drawing.Size(201, 22) Me.cmenTabRefreshScreen.Text = "Refresh Screen (VNC)" @@ -137,7 +137,7 @@ Namespace UI 'cmenTabSendSpecialKeys ' Me.cmenTabSendSpecialKeys.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmenTabSendSpecialKeysCtrlAltDel, Me.cmenTabSendSpecialKeysCtrlEsc}) - Me.cmenTabSendSpecialKeys.Image = Global.mRemote.My.Resources.Resources.Keyboard + Me.cmenTabSendSpecialKeys.Image = Global.mRemoteNG.My.Resources.Resources.Keyboard Me.cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys" Me.cmenTabSendSpecialKeys.Size = New System.Drawing.Size(201, 22) Me.cmenTabSendSpecialKeys.Text = "Send special Keys (VNC)" @@ -168,7 +168,7 @@ Namespace UI ' 'cmenTabRenameTab ' - Me.cmenTabRenameTab.Image = Global.mRemote.My.Resources.Resources.Rename + Me.cmenTabRenameTab.Image = Global.mRemoteNG.My.Resources.Resources.Rename Me.cmenTabRenameTab.Name = "cmenTabRenameTab" Me.cmenTabRenameTab.Size = New System.Drawing.Size(201, 22) Me.cmenTabRenameTab.Text = "Rename Tab" @@ -188,7 +188,7 @@ Namespace UI ' 'cmenTabDisconnect ' - Me.cmenTabDisconnect.Image = Global.mRemote.My.Resources.Resources.Pause + Me.cmenTabDisconnect.Image = Global.mRemoteNG.My.Resources.Resources.Pause Me.cmenTabDisconnect.Name = "cmenTabDisconnect" Me.cmenTabDisconnect.Size = New System.Drawing.Size(201, 22) Me.cmenTabDisconnect.Text = "Disconnect" @@ -204,7 +204,7 @@ Namespace UI Me.ClientSize = New System.Drawing.Size(632, 453) Me.Controls.Add(Me.TabController) Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon Me.Name = "Connection" Me.TabText = "UI.Window.Connection" Me.Text = "UI.Window.Connection" @@ -228,7 +228,7 @@ Namespace UI Me.TabText = FormText End Sub - Public Function AddConnectionTab(ByVal conI As mRemote.Connection.Info) As Magic.Controls.TabPage + Public Function AddConnectionTab(ByVal conI As mRemoteNG.Connection.Info) As Magic.Controls.TabPage Try Dim nTab As New Magic.Controls.TabPage nTab.Anchor = AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right Or AnchorStyles.Top @@ -259,7 +259,7 @@ Namespace UI nTab.Title &= ")" End If - Dim conIcon As Icon = mRemote.Connection.Icon.FromString(conI.Icon) + Dim conIcon As Icon = mRemoteNG.Connection.Icon.FromString(conI.Icon) If conIcon IsNot Nothing Then nTab.Icon = conIcon End If @@ -308,7 +308,7 @@ Namespace UI Try For Each tabP As Magic.Controls.TabPage In Me.TabController.TabPages If tabP.Tag IsNot Nothing Then - Dim IC As mRemote.Connection.InterfaceControl = tabP.Tag + Dim IC As mRemoteNG.Connection.InterfaceControl = tabP.Tag IC.Protocol.Close() End If Next @@ -321,8 +321,8 @@ Namespace UI Try For Each tabP As Magic.Controls.TabPage In Me.TabController.TabPages If tabP.Tag IsNot Nothing Then - If TypeOf tabP.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = tabP.Tag + If TypeOf tabP.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = tabP.Tag IC.Protocol.Resize() End If End If @@ -345,7 +345,7 @@ Namespace UI Private Sub CloseConnectionTab() Try If Me.TabController.SelectedTab.Tag IsNot Nothing Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag IC.Protocol.Close() Else Me.CloseTab(Me.TabController.SelectedTab) @@ -364,7 +364,7 @@ Namespace UI #Region "Drag and Drop" Private Sub TabController_DragDrop(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) Handles TabController.DragDrop If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", True) Then - App.Runtime.OpenConnection(e.Data.GetData("System.Windows.Forms.TreeNode", True).Tag, Me, mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(e.Data.GetData("System.Windows.Forms.TreeNode", True).Tag, Me, mRemoteNG.Connection.Info.Force.DoNotJump) End If End Sub @@ -387,17 +387,17 @@ Namespace UI Exit Sub End If - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag If IC Is Nothing Then Exit Sub End If - If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then + If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then Me.cmenTabFullscreen.Enabled = True Me.cmenTabSmartSize.Enabled = True - Dim rdp As mRemote.Connection.Protocol.RDP = IC.Protocol + Dim rdp As mRemoteNG.Connection.Protocol.RDP = IC.Protocol Me.cmenTabSmartSize.Checked = rdp.SmartSize Me.cmenTabFullscreen.Checked = rdp.Fullscreen Else @@ -405,7 +405,7 @@ Namespace UI Me.cmenTabSmartSize.Enabled = False End If - If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.VNC Then + If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.VNC Then Me.cmenTabSendSpecialKeys.Enabled = True Me.cmenTabViewOnly.Enabled = True @@ -414,7 +414,7 @@ Namespace UI Me.cmenTabRefreshScreen.Enabled = True Me.cmenTabTransferFile.Enabled = False - Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol + Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol Me.cmenTabSmartSize.Checked = vnc.SmartSize Me.cmenTabViewOnly.Checked = vnc.ViewOnly Else @@ -425,11 +425,11 @@ Namespace UI Me.cmenTabTransferFile.Enabled = False End If - If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH2 Then + If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH2 Then Me.cmenTabTransferFile.Enabled = True End If - If TypeOf IC.Protocol Is mRemote.Connection.Protocol.PuttyBase Then + If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.PuttyBase Then Me.cmenTabPuttySettings.Enabled = True Else Me.cmenTabPuttySettings.Enabled = False @@ -472,11 +472,11 @@ Namespace UI End Sub Private Sub cmenTabSendSpecialKeysCtrlAltDel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmenTabSendSpecialKeysCtrlAltDel.Click - Me.SendSpecialKeys(mRemote.Connection.Protocol.VNC.SpecialKeys.CtrlAltDel) + Me.SendSpecialKeys(mRemoteNG.Connection.Protocol.VNC.SpecialKeys.CtrlAltDel) End Sub Private Sub cmenTabSendSpecialKeysCtrlEsc_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmenTabSendSpecialKeysCtrlEsc.Click - Me.SendSpecialKeys(mRemote.Connection.Protocol.VNC.SpecialKeys.CtrlEsc) + Me.SendSpecialKeys(mRemoteNG.Connection.Protocol.VNC.SpecialKeys.CtrlEsc) End Sub Private Sub cmenTabFullscreen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmenTabFullscreen.Click @@ -508,14 +508,14 @@ Namespace UI Private Sub ToggleSmartSize() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If TypeOf IC.Protocol Is mRemote.Connection.Protocol.RDP Then - Dim rdp As mRemote.Connection.Protocol.RDP = IC.Protocol + If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.RDP Then + Dim rdp As mRemoteNG.Connection.Protocol.RDP = IC.Protocol rdp.ToggleSmartSize() - ElseIf TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then - Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol + ElseIf TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then + Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol vnc.ToggleSmartSize() End If End If @@ -528,12 +528,12 @@ Namespace UI Private Sub TransferFile() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH2 Then + If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH2 Then SSHTransferFile() - ElseIf IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.VNC Then + ElseIf IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.VNC Then VNCTransferFile() End If End If @@ -546,11 +546,11 @@ Namespace UI Private Sub SSHTransferFile() Try - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag Windows.Show(Type.SSHTransfer) - Dim conI As mRemote.Connection.Info = IC.Info + Dim conI As mRemoteNG.Connection.Info = IC.Info Windows.sshtransferForm.Hostname = conI.Hostname Windows.sshtransferForm.Username = conI.Username @@ -563,8 +563,8 @@ Namespace UI Private Sub VNCTransferFile() Try - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol vnc.StartFileTransfer() Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNCTransferFile (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) @@ -574,13 +574,13 @@ Namespace UI Private Sub ToggleViewOnly() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then + If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then cmenTabViewOnly.Checked = Not cmenTabViewOnly.Checked - Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol + Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol vnc.ToggleViewOnly() End If End If @@ -593,11 +593,11 @@ Namespace UI Private Sub StartChat() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then - Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol + If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then + Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol vnc.StartChat() End If End If @@ -610,11 +610,11 @@ Namespace UI Private Sub RefreshScreen() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then - Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol + If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then + Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol vnc.RefreshScreen() End If End If @@ -624,14 +624,14 @@ Namespace UI End Try End Sub - Private Sub SendSpecialKeys(ByVal Keys As mRemote.Connection.Protocol.VNC.SpecialKeys) + Private Sub SendSpecialKeys(ByVal Keys As mRemoteNG.Connection.Protocol.VNC.SpecialKeys) Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then - Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol + If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then + Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol vnc.SendSpecialKeys(Keys) End If End If @@ -644,11 +644,11 @@ Namespace UI Private Sub ToggleFullscreen() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If TypeOf IC.Protocol Is mRemote.Connection.Protocol.RDP Then - Dim rdp As mRemote.Connection.Protocol.RDP = IC.Protocol + If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.RDP Then + Dim rdp As mRemoteNG.Connection.Protocol.RDP = IC.Protocol rdp.ToggleFullscreen() End If End If @@ -661,11 +661,11 @@ Namespace UI Private Sub ShowPuttySettingsDialog() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim objInterfaceControl As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim objInterfaceControl As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If TypeOf objInterfaceControl.Protocol Is mRemote.Connection.Protocol.PuttyBase Then - Dim objPuttyBase As mRemote.Connection.Protocol.PuttyBase = objInterfaceControl.Protocol + If TypeOf objInterfaceControl.Protocol Is mRemoteNG.Connection.Protocol.PuttyBase Then + Dim objPuttyBase As mRemoteNG.Connection.Protocol.PuttyBase = objInterfaceControl.Protocol objPuttyBase.ShowSettingsDialog() End If @@ -701,8 +701,8 @@ Namespace UI Private Sub StartExternalApp(ByVal ExtA As Tools.ExternalApp) Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag ExtA.Start(IC.Info) End If @@ -716,8 +716,8 @@ Namespace UI Private Sub CloseTabMenu() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag IC.Protocol.Close() End If @@ -730,10 +730,10 @@ Namespace UI Private Sub DuplicateTab() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - App.Runtime.OpenConnection(IC.Info, mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(IC.Info, mRemoteNG.Connection.Info.Force.DoNotJump) End If End If Catch ex As Exception @@ -744,13 +744,13 @@ Namespace UI Private Sub Reconnect() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - Dim conI As mRemote.Connection.Info = IC.Info + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + Dim conI As mRemoteNG.Connection.Info = IC.Info IC.Protocol.Close() - App.Runtime.OpenConnection(conI, mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(conI, mRemoteNG.Connection.Info.Force.DoNotJump) End If End If Catch ex As Exception @@ -773,7 +773,7 @@ Namespace UI #Region "Protocols" Public Sub Prot_Event_Closed(ByVal sender As Object) - Dim Prot As mRemote.Connection.Protocol.Base = sender + Dim Prot As mRemoteNG.Connection.Protocol.Base = sender CloseTab(Prot.InterfaceControl.Parent) End Sub #End Region @@ -814,8 +814,8 @@ Namespace UI Private Sub FocusIC() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag IC.Protocol.Focus() End If End If @@ -827,11 +827,11 @@ Namespace UI Public Sub RefreshIC() Try If Me.TabController.SelectedTab IsNot Nothing Then - If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.VNC Then - TryCast(IC.Protocol, mRemote.Connection.Protocol.VNC).RefreshScreen() + If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.VNC Then + TryCast(IC.Protocol, mRemoteNG.Connection.Protocol.VNC).RefreshScreen() End If End If End If @@ -850,9 +850,9 @@ Namespace UI If curRect.Contains(Form.MousePosition) Then If curTab IsNot Nothing Then - Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag + Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag - If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then + If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then IC.Protocol.Focus() End If End If diff --git a/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb b/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb index 63062f67..dd6f934f 100644 --- a/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb +++ b/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -116,7 +116,7 @@ Namespace UI ' 'cMenMCCopy ' - Me.cMenMCCopy.Image = Global.mRemote.My.Resources.Resources.Copy + Me.cMenMCCopy.Image = Global.mRemoteNG.My.Resources.Resources.Copy Me.cMenMCCopy.Name = "cMenMCCopy" Me.cMenMCCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) Me.cMenMCCopy.Size = New System.Drawing.Size(136, 22) @@ -124,7 +124,7 @@ Namespace UI ' 'cMenMCDelete ' - Me.cMenMCDelete.Image = Global.mRemote.My.Resources.Resources.Delete + Me.cMenMCDelete.Image = Global.mRemoteNG.My.Resources.Resources.Delete Me.cMenMCDelete.Name = "cMenMCDelete" Me.cMenMCDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete Me.cMenMCDelete.Size = New System.Drawing.Size(136, 22) @@ -142,7 +142,7 @@ Namespace UI Me.Controls.Add(Me.lvErrorCollector) Me.Controls.Add(Me.pnlErrorMsg) Me.HideOnClose = True - Me.Icon = Global.mRemote.My.Resources.Resources.Info_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Info_Icon Me.Name = "ErrorsAndInfos" Me.TabText = My.Resources.strMenuNotifications Me.Text = My.Resources.strMenuNotifications @@ -351,7 +351,7 @@ Namespace UI End Try End Sub #End Region - + Public Enum ControlLayout Vertical = 0 Horizontal = 1 diff --git a/mRemoteV1/UI/UI.Window.ExternalApps.vb b/mRemoteV1/UI/UI.Window.ExternalApps.vb index 375cc275..3ad4c6ec 100644 --- a/mRemoteV1/UI/UI.Window.ExternalApps.vb +++ b/mRemoteV1/UI/UI.Window.ExternalApps.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -115,7 +115,7 @@ Namespace UI ' 'cMenAppsAdd ' - Me.cMenAppsAdd.Image = Global.mRemote.My.Resources.Resources.ExtApp_Add + Me.cMenAppsAdd.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp_Add Me.cMenAppsAdd.Name = "cMenAppsAdd" Me.cMenAppsAdd.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys) Me.cMenAppsAdd.Size = New System.Drawing.Size(147, 22) @@ -123,7 +123,7 @@ Namespace UI ' 'cMenAppsRemove ' - Me.cMenAppsRemove.Image = Global.mRemote.My.Resources.Resources.ExtApp_Delete + Me.cMenAppsRemove.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp_Delete Me.cMenAppsRemove.Name = "cMenAppsRemove" Me.cMenAppsRemove.ShortcutKeys = System.Windows.Forms.Keys.Delete Me.cMenAppsRemove.Size = New System.Drawing.Size(147, 22) @@ -136,7 +136,7 @@ Namespace UI ' 'cMenAppsStart ' - Me.cMenAppsStart.Image = Global.mRemote.My.Resources.Resources.ExtApp_Start + Me.cMenAppsStart.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp_Start Me.cMenAppsStart.Name = "cMenAppsStart" Me.cMenAppsStart.Size = New System.Drawing.Size(147, 22) Me.cMenAppsStart.Text = "Start" @@ -405,7 +405,7 @@ Namespace UI Private Sub StartApp() Try For Each lvItem As ListViewItem In lvApps.SelectedItems - TryCast(lvItem.Tag, mRemote.Tools.ExternalApp).Start() + TryCast(lvItem.Tag, mRemoteNG.Tools.ExternalApp).Start() Next Catch ex As Exception mC.AddMessage(Messages.MessageClass.WarningMsg, "StartApp failed (UI.Window.ExternalApps" & vbNewLine & ex.Message, True) diff --git a/mRemoteV1/UI/UI.Window.Help.vb b/mRemoteV1/UI/UI.Window.Help.vb index 5248208d..634f7750 100644 --- a/mRemoteV1/UI/UI.Window.Help.vb +++ b/mRemoteV1/UI/UI.Window.Help.vb @@ -1,5 +1,4 @@ -Imports mRemote.App.Runtime -Imports WeifenLuo.WinFormsUI.Docking +Imports WeifenLuo.WinFormsUI.Docking Namespace UI Namespace Window @@ -195,7 +194,7 @@ Namespace UI ' Me.ClientSize = New System.Drawing.Size(542, 323) Me.Controls.Add(Me.pnlSplitter) - Me.Icon = Global.mRemote.My.Resources.Resources.Help_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Help_Icon Me.Name = "Help" Me.TabText = "Help" Me.Text = "Help" diff --git a/mRemoteV1/UI/UI.Window.Options.vb b/mRemoteV1/UI/UI.Window.Options.vb index 31bfbc41..04e0128f 100644 --- a/mRemoteV1/UI/UI.Window.Options.vb +++ b/mRemoteV1/UI/UI.Window.Options.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -247,7 +247,7 @@ Namespace UI 'tabConnections ' Me.tabConnections.Controls.Add(Me.pnlConnections) - Me.tabConnections.Icon = Global.mRemote.My.Resources.Resources.Root_Icon + Me.tabConnections.Icon = Global.mRemoteNG.My.Resources.Resources.Root_Icon Me.tabConnections.Location = New System.Drawing.Point(0, 0) Me.tabConnections.Name = "tabConnections" Me.tabConnections.Selected = False @@ -567,7 +567,7 @@ Namespace UI 'tabStartupExit ' Me.tabStartupExit.Controls.Add(Me.pnlStartup) - Me.tabStartupExit.Icon = Global.mRemote.My.Resources.Resources.StartupExit_Icon + Me.tabStartupExit.Icon = Global.mRemoteNG.My.Resources.Resources.StartupExit_Icon Me.tabStartupExit.Location = New System.Drawing.Point(0, 0) Me.tabStartupExit.Name = "tabStartupExit" Me.tabStartupExit.Selected = False @@ -649,7 +649,7 @@ Namespace UI 'tabAppearance ' Me.tabAppearance.Controls.Add(Me.pnlAppearance) - Me.tabAppearance.Icon = Global.mRemote.My.Resources.Resources.Appearance_Icon + Me.tabAppearance.Icon = Global.mRemoteNG.My.Resources.Resources.Appearance_Icon Me.tabAppearance.Location = New System.Drawing.Point(0, 0) Me.tabAppearance.Name = "tabAppearance" Me.tabAppearance.Selected = False @@ -719,7 +719,7 @@ Namespace UI 'tabTabs ' Me.tabTabs.Controls.Add(Me.pnlTabsAndPanels) - Me.tabTabs.Icon = Global.mRemote.My.Resources.Resources.Tab_Icon + Me.tabTabs.Icon = Global.mRemoteNG.My.Resources.Resources.Tab_Icon Me.tabTabs.Location = New System.Drawing.Point(0, 0) Me.tabTabs.Name = "tabTabs" Me.tabTabs.Selected = False @@ -862,7 +862,7 @@ Namespace UI 'tabUpdates ' Me.tabUpdates.Controls.Add(Me.pnlUpdates) - Me.tabUpdates.Icon = Global.mRemote.My.Resources.Resources.Info_Icon + Me.tabUpdates.Icon = Global.mRemoteNG.My.Resources.Resources.Info_Icon Me.tabUpdates.Location = New System.Drawing.Point(0, 0) Me.tabUpdates.Name = "tabUpdates" Me.tabUpdates.Size = New System.Drawing.Size(573, 492) @@ -1077,7 +1077,7 @@ Namespace UI 'tabAdvanced ' Me.tabAdvanced.Controls.Add(Me.pnlAdvanced) - Me.tabAdvanced.Icon = Global.mRemote.My.Resources.Resources.Config_Icon + Me.tabAdvanced.Icon = Global.mRemoteNG.My.Resources.Resources.Config_Icon Me.tabAdvanced.Location = New System.Drawing.Point(0, 0) Me.tabAdvanced.Name = "tabAdvanced" Me.tabAdvanced.Selected = False @@ -1225,7 +1225,7 @@ Namespace UI 'btnLaunchPutty ' Me.btnLaunchPutty.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnLaunchPutty.Image = Global.mRemote.My.Resources.Resources.PuttyConfig + Me.btnLaunchPutty.Image = Global.mRemoteNG.My.Resources.Resources.PuttyConfig Me.btnLaunchPutty.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnLaunchPutty.Location = New System.Drawing.Point(297, 153) Me.btnLaunchPutty.Name = "btnLaunchPutty" @@ -1315,7 +1315,7 @@ Namespace UI Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnOK) Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = Global.mRemote.My.Resources.Resources.Options_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Options_Icon Me.Name = "Options" Me.TabText = "Options" Me.Text = "Options" @@ -1387,7 +1387,7 @@ Namespace UI Me.chkUseSQLServer.Checked = My.Settings.UseSQLServer Me.txtSQLServer.Text = My.Settings.SQLHost Me.txtSQLUsername.Text = My.Settings.SQLUser - Me.txtSQLPassword.Text = mRemote.Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey) + Me.txtSQLPassword.Text = mRemoteNG.Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey) Select Case My.Settings.EmptyCredentials Case "noinfo" @@ -1399,7 +1399,7 @@ Namespace UI End Select Me.txtCredentialsUsername.Text = My.Settings.DefaultUsername - Me.txtCredentialsPassword.Text = mRemote.Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) + Me.txtCredentialsPassword.Text = mRemoteNG.Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) Me.txtCredentialsDomain.Text = My.Settings.DefaultDomain Me.chkUseOnlyErrorsAndInfosPanel.Checked = My.Settings.ShowNoMessageBoxes @@ -1503,7 +1503,7 @@ Namespace UI My.Settings.UseSQLServer = Me.chkUseSQLServer.Checked My.Settings.SQLHost = Me.txtSQLServer.Text My.Settings.SQLUser = Me.txtSQLUsername.Text - My.Settings.SQLPass = mRemote.Security.Crypt.Encrypt(Me.txtSQLPassword.Text, App.Info.General.EncryptionKey) + My.Settings.SQLPass = mRemoteNG.Security.Crypt.Encrypt(Me.txtSQLPassword.Text, App.Info.General.EncryptionKey) If Me.radCredentialsNoInfo.Checked Then My.Settings.EmptyCredentials = "noinfo" @@ -1514,7 +1514,7 @@ Namespace UI End If My.Settings.DefaultUsername = Me.txtCredentialsUsername.Text - My.Settings.DefaultPassword = mRemote.Security.Crypt.Encrypt(Me.txtCredentialsPassword.Text, App.Info.General.EncryptionKey) + My.Settings.DefaultPassword = mRemoteNG.Security.Crypt.Encrypt(Me.txtCredentialsPassword.Text, App.Info.General.EncryptionKey) My.Settings.DefaultDomain = Me.txtCredentialsDomain.Text My.Settings.ShowNoMessageBoxes = Me.chkUseOnlyErrorsAndInfosPanel.Checked @@ -1543,9 +1543,9 @@ Namespace UI My.Settings.CustomPuttyPath = Me.txtCustomPuttyPath.Text If My.Settings.UseCustomPuttyPath Then - mRemote.Connection.Protocol.PuttyBase.PuttyPath = My.Settings.CustomPuttyPath + mRemoteNG.Connection.Protocol.PuttyBase.PuttyPath = My.Settings.CustomPuttyPath Else - mRemote.Connection.Protocol.PuttyBase.PuttyPath = My.Application.Info.DirectoryPath & "\putty.exe" + mRemoteNG.Connection.Protocol.PuttyBase.PuttyPath = My.Application.Info.DirectoryPath & "\putty.exe" End If My.Settings.MaxPuttyWaitTime = Me.numPuttyWaitTime.Value @@ -1744,7 +1744,7 @@ Namespace UI End Sub Private Sub btnLaunchPutty_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnLaunchPutty.Click - mRemote.Connection.Protocol.PuttyBase.StartPutty() + mRemoteNG.Connection.Protocol.PuttyBase.StartPutty() End Sub Private Sub btnBrowseCustomPuttyPath_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnBrowseCustomPuttyPath.Click diff --git a/mRemoteV1/UI/UI.Window.PortScan.vb b/mRemoteV1/UI/UI.Window.PortScan.vb index d4700671..3f1fd810 100644 --- a/mRemoteV1/UI/UI.Window.PortScan.vb +++ b/mRemoteV1/UI/UI.Window.PortScan.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -112,7 +112,7 @@ Namespace UI ' Me.btnScan.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnScan.Image = Global.mRemote.My.Resources.Resources.Search + Me.btnScan.Image = Global.mRemoteNG.My.Resources.Resources.Search Me.btnScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnScan.Location = New System.Drawing.Point(448, 8) Me.btnScan.Name = "btnScan" @@ -418,7 +418,7 @@ Namespace UI End Sub Private Sub btnImport_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnImport.Click - Dim prot As mRemote.Connection.Protocol.Protocols = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.Protocols), cbProtocol.SelectedItem) + Dim prot As mRemoteNG.Connection.Protocol.Protocols = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.Protocols), cbProtocol.SelectedItem) Dim arrHosts As New ArrayList For Each lvItem As ListViewItem In lvHosts.SelectedItems diff --git a/mRemoteV1/UI/UI.Window.QuickConnect.vb b/mRemoteV1/UI/UI.Window.QuickConnect.vb index 31709636..d5e01a91 100644 --- a/mRemoteV1/UI/UI.Window.QuickConnect.vb +++ b/mRemoteV1/UI/UI.Window.QuickConnect.vb @@ -1,6 +1,6 @@ Imports WeifenLuo.WinFormsUI.Docking Imports System.Reflection -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -43,7 +43,7 @@ Namespace UI Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.flpProtocols) Me.HideOnClose = True - Me.Icon = Global.mRemote.My.Resources.Resources.Play_Quick_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Play_Quick_Icon Me.Name = "QuickConnect" Me.TabText = My.Resources.strQuickConnect Me.Text = My.Resources.strQuickConnect @@ -61,12 +61,12 @@ Namespace UI #End Region #Region "Public Properties" - Private _ConnectionInfo As mRemote.Connection.Info - Public Property ConnectionInfo() As mRemote.Connection.Info + Private _ConnectionInfo As mRemoteNG.Connection.Info + Public Property ConnectionInfo() As mRemoteNG.Connection.Info Get Return Me._ConnectionInfo End Get - Set(ByVal value As mRemote.Connection.Info) + Set(ByVal value As mRemoteNG.Connection.Info) Me._ConnectionInfo = value End Set End Property @@ -92,7 +92,7 @@ Namespace UI Private Sub CreateButtons() Try - For Each fI As FieldInfo In GetType(mRemote.Connection.Protocol.Protocols).GetFields + For Each fI As FieldInfo In GetType(mRemoteNG.Connection.Protocol.Protocols).GetFields If fI.Name <> "value__" And fI.Name <> "NONE" And fI.Name <> "IntApp" Then Dim nBtn As New Button nBtn.Text = fI.Name @@ -110,21 +110,21 @@ Namespace UI Private Sub ProtocolButton_Click(ByVal sender As Object, ByVal e As System.EventArgs) Try - Me._ConnectionInfo.Protocol = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.Protocols), sender.Text) + Me._ConnectionInfo.Protocol = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.Protocols), sender.Text) If Me._ConnectionInfo.Port = 0 Then Me._ConnectionInfo.SetDefaultPort() - If mRemote.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then - mRemote.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname) + If mRemoteNG.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then + mRemoteNG.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname) End If Else - If mRemote.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then - mRemote.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname & ":" & Me._ConnectionInfo.Port) + If mRemoteNG.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then + mRemoteNG.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname & ":" & Me._ConnectionInfo.Port) End If End If - App.Runtime.OpenConnection(Me._ConnectionInfo, mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(Me._ConnectionInfo, mRemoteNG.Connection.Info.Force.DoNotJump) Me.Hide() Catch ex As Exception diff --git a/mRemoteV1/UI/UI.Window.SSHTransfer.vb b/mRemoteV1/UI/UI.Window.SSHTransfer.vb index c795ea33..12c90b75 100644 --- a/mRemoteV1/UI/UI.Window.SSHTransfer.vb +++ b/mRemoteV1/UI/UI.Window.SSHTransfer.vb @@ -1,9 +1,8 @@ Imports WeifenLuo.WinFormsUI.Docking Imports Tamir.SharpSsh -Imports Tamir.SharpSsh.jsch Imports System.IO Imports System.Threading -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -122,7 +121,7 @@ Namespace UI Me.btnBrowse.Name = "btnBrowse" Me.btnBrowse.Size = New System.Drawing.Size(81, 23) Me.btnBrowse.TabIndex = 30 - Me.btnBrowse.Text = Global.mRemote.My.Resources.Resources.strButtonBrowse + Me.btnBrowse.Text = Global.mRemoteNG.My.Resources.Resources.strButtonBrowse Me.btnBrowse.UseVisualStyleBackColor = True ' 'grpConnection @@ -262,7 +261,7 @@ Namespace UI ' Me.btnTransfer.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.btnTransfer.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.btnTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer + Me.btnTransfer.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer Me.btnTransfer.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft Me.btnTransfer.Location = New System.Drawing.Point(597, 382) Me.btnTransfer.Name = "btnTransfer" @@ -291,7 +290,7 @@ Namespace UI Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "SSHTransfer" - Me.TabText = Global.mRemote.My.Resources.Resources.strMenuSSHFileTransfer + Me.TabText = Global.mRemoteNG.My.Resources.Resources.strMenuSSHFileTransfer Me.Text = "SSH File Transfer" Me.grpFiles.ResumeLayout(False) Me.grpFiles.PerformLayout() diff --git a/mRemoteV1/UI/UI.Window.SaveAs.vb b/mRemoteV1/UI/UI.Window.SaveAs.vb index bfe3d0e8..d811c3fe 100644 --- a/mRemoteV1/UI/UI.Window.SaveAs.vb +++ b/mRemoteV1/UI/UI.Window.SaveAs.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -105,7 +105,7 @@ Namespace UI ' 'PictureBox1 ' - Me.PictureBox1.Image = Global.mRemote.My.Resources.Resources.WarningSmall + Me.PictureBox1.Image = Global.mRemoteNG.My.Resources.Resources.WarningSmall Me.PictureBox1.Location = New System.Drawing.Point(15, 31) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(16, 16) @@ -123,7 +123,7 @@ Namespace UI Me.Controls.Add(Me.lvSecurity) Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnOK) - Me.Icon = Global.mRemote.My.Resources.Resources.Connections_SaveAs_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Connections_SaveAs_Icon Me.Name = "SaveAs" Me.TabText = "Save Connections As" Me.Text = "Save Connections As" diff --git a/mRemoteV1/UI/UI.Window.ScreenshotManager.vb b/mRemoteV1/UI/UI.Window.ScreenshotManager.vb index 1f4979bc..8283838a 100644 --- a/mRemoteV1/UI/UI.Window.ScreenshotManager.vb +++ b/mRemoteV1/UI/UI.Window.ScreenshotManager.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Imports System.IO Namespace UI @@ -61,21 +61,21 @@ Namespace UI 'mMenFile ' Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileSaveAll, Me.mMenFileRemoveAll}) - Me.mMenFile.Image = Global.mRemote.My.Resources.Resources.File + Me.mMenFile.Image = Global.mRemoteNG.My.Resources.Resources.File Me.mMenFile.Name = "mMenFile" Me.mMenFile.Size = New System.Drawing.Size(51, 20) Me.mMenFile.Text = "&File" ' 'mMenFileSaveAll ' - Me.mMenFileSaveAll.Image = Global.mRemote.My.Resources.Resources.Screenshot_Save + Me.mMenFileSaveAll.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Save Me.mMenFileSaveAll.Name = "mMenFileSaveAll" Me.mMenFileSaveAll.Size = New System.Drawing.Size(128, 22) Me.mMenFileSaveAll.Text = "Save All" ' 'mMenFileRemoveAll ' - Me.mMenFileRemoveAll.Image = Global.mRemote.My.Resources.Resources.Screenshot_Delete + Me.mMenFileRemoveAll.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Delete Me.mMenFileRemoveAll.Name = "mMenFileRemoveAll" Me.mMenFileRemoveAll.Size = New System.Drawing.Size(128, 22) Me.mMenFileRemoveAll.Text = "Remove All" @@ -88,14 +88,14 @@ Namespace UI ' 'cMenScreenshotCopy ' - Me.cMenScreenshotCopy.Image = Global.mRemote.My.Resources.Resources.Screenshot_Copy + Me.cMenScreenshotCopy.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Copy Me.cMenScreenshotCopy.Name = "cMenScreenshotCopy" Me.cMenScreenshotCopy.Size = New System.Drawing.Size(99, 22) Me.cMenScreenshotCopy.Text = "Copy" ' 'cMenScreenshotSave ' - Me.cMenScreenshotSave.Image = Global.mRemote.My.Resources.Resources.Screenshot_Save + Me.cMenScreenshotSave.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Save Me.cMenScreenshotSave.Name = "cMenScreenshotSave" Me.cMenScreenshotSave.Size = New System.Drawing.Size(99, 22) Me.cMenScreenshotSave.Text = "Save" @@ -113,7 +113,7 @@ Namespace UI Me.Controls.Add(Me.flpScreenshots) Me.Controls.Add(Me.msMain) Me.HideOnClose = True - Me.Icon = Global.mRemote.My.Resources.Resources.Screenshot_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Screenshot_Icon Me.MainMenuStrip = Me.msMain Me.Name = "ScreenshotManager" Me.TabText = "Screenshots" diff --git a/mRemoteV1/UI/UI.Window.Sessions.vb b/mRemoteV1/UI/UI.Window.Sessions.vb index e6db1ec3..356af482 100644 --- a/mRemoteV1/UI/UI.Window.Sessions.vb +++ b/mRemoteV1/UI/UI.Window.Sessions.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -71,14 +71,14 @@ Namespace UI ' 'cMenSessionRefresh ' - Me.cMenSessionRefresh.Image = Global.mRemote.My.Resources.Resources.Refresh + Me.cMenSessionRefresh.Image = Global.mRemoteNG.My.Resources.Resources.Refresh Me.cMenSessionRefresh.Name = "cMenSessionRefresh" Me.cMenSessionRefresh.Size = New System.Drawing.Size(123, 22) Me.cMenSessionRefresh.Text = My.Resources.strRefresh ' 'cMenSessionLogOff ' - Me.cMenSessionLogOff.Image = Global.mRemote.My.Resources.Resources.Session_LogOff + Me.cMenSessionLogOff.Image = Global.mRemoteNG.My.Resources.Resources.Session_LogOff Me.cMenSessionLogOff.Name = "cMenSessionLogOff" Me.cMenSessionLogOff.Size = New System.Drawing.Size(123, 22) Me.cMenSessionLogOff.Text = My.Resources.strLogOff @@ -140,9 +140,9 @@ Namespace UI #Region "Private Methods" Private Sub GetSessionsBG() Try - Dim tS As New mRemote.Connection.Protocol.RDP.TerminalSessions + Dim tS As New mRemoteNG.Connection.Protocol.RDP.TerminalSessions Dim sU As New Security.Impersonator - Dim tsSessions As New mRemote.Connection.Protocol.RDP.Sessions + Dim tsSessions As New mRemoteNG.Connection.Protocol.RDP.Sessions sU.StartImpersonation(tDomain, tUserName, tPassword) @@ -189,7 +189,7 @@ Namespace UI Exit Sub End If - Dim ts As New mRemote.Connection.Protocol.RDP.TerminalSessions + Dim ts As New mRemoteNG.Connection.Protocol.RDP.TerminalSessions Dim sU As New Security.Impersonator sU.StartImpersonation(tDomain, tUserName, tPassword) @@ -259,17 +259,17 @@ Namespace UI Try Dim nowHost As String = "" - If TypeOf mRemote.Tree.Node.SelectedNode.Tag Is mRemote.Connection.Info Then - nowHost = TryCast(mRemote.Tree.Node.SelectedNode.Tag, mRemote.Connection.Info).Hostname + If TypeOf mRemoteNG.Tree.Node.SelectedNode.Tag Is mRemoteNG.Connection.Info Then + nowHost = TryCast(mRemoteNG.Tree.Node.SelectedNode.Tag, mRemoteNG.Connection.Info).Hostname Else Me.ClearList() Exit Sub End If If My.Settings.AutomaticallyGetSessionInfo And Me._CurrentHost = nowHost Then - Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag + Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag - If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemote.Connection.Protocol.Protocols.ICA Then + If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.ICA Then 'continue Else Me.ClearList() @@ -302,20 +302,20 @@ Namespace UI End Sub Public Sub GetSessions() - If mRemote.Tree.Node.SelectedNode Is Nothing Then + If mRemoteNG.Tree.Node.SelectedNode Is Nothing Then Exit Sub End If - If TypeOf mRemote.Tree.Node.SelectedNode.Tag Is mRemote.Connection.Info Then + If TypeOf mRemoteNG.Tree.Node.SelectedNode.Tag Is mRemoteNG.Connection.Info Then 'continue Else Me.ClearList() Exit Sub End If - Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag + Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag - If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemote.Connection.Protocol.Protocols.ICA Then + If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.ICA Then 'continue Else Me.ClearList() @@ -364,15 +364,15 @@ Namespace UI End Sub Public Sub KillSession() - If TypeOf mRemote.Tree.Node.SelectedNode.Tag Is mRemote.Connection.Info Then + If TypeOf mRemoteNG.Tree.Node.SelectedNode.Tag Is mRemoteNG.Connection.Info Then 'continue Else Exit Sub End If - Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag + Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag - If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then + If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then 'continue Else Exit Sub diff --git a/mRemoteV1/UI/UI.Window.Tree.vb b/mRemoteV1/UI/UI.Window.Tree.vb index a74a607e..200aaeca 100644 --- a/mRemoteV1/UI/UI.Window.Tree.vb +++ b/mRemoteV1/UI/UI.Window.Tree.vb @@ -1,5 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -130,14 +130,14 @@ Namespace UI ' 'cMenTreeAddConnection ' - Me.cMenTreeAddConnection.Image = Global.mRemote.My.Resources.Resources.Connection_Add + Me.cMenTreeAddConnection.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Add Me.cMenTreeAddConnection.Name = "cMenTreeAddConnection" Me.cMenTreeAddConnection.Size = New System.Drawing.Size(186, 22) Me.cMenTreeAddConnection.Text = "New Connection" ' 'cMenTreeAddFolder ' - Me.cMenTreeAddFolder.Image = Global.mRemote.My.Resources.Resources.Folder_Add + Me.cMenTreeAddFolder.Image = Global.mRemoteNG.My.Resources.Resources.Folder_Add Me.cMenTreeAddFolder.Name = "cMenTreeAddFolder" Me.cMenTreeAddFolder.Size = New System.Drawing.Size(186, 22) Me.cMenTreeAddFolder.Text = "New Folder" @@ -149,7 +149,7 @@ Namespace UI ' 'cMenTreeConnect ' - Me.cMenTreeConnect.Image = Global.mRemote.My.Resources.Resources.Play + Me.cMenTreeConnect.Image = Global.mRemoteNG.My.Resources.Resources.Play Me.cMenTreeConnect.Name = "cMenTreeConnect" Me.cMenTreeConnect.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _ Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) @@ -178,21 +178,21 @@ Namespace UI ' 'cMenTreeConnectWithOptionsConnectInFullscreen ' - Me.cMenTreeConnectWithOptionsConnectInFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen + Me.cMenTreeConnectWithOptionsConnectInFullscreen.Image = Global.mRemoteNG.My.Resources.Resources.Fullscreen Me.cMenTreeConnectWithOptionsConnectInFullscreen.Name = "cMenTreeConnectWithOptionsConnectInFullscreen" Me.cMenTreeConnectWithOptionsConnectInFullscreen.Size = New System.Drawing.Size(231, 22) Me.cMenTreeConnectWithOptionsConnectInFullscreen.Text = "Connect in fullscreen" ' 'cMenTreeConnectWithOptionsChoosePanelBeforeConnecting ' - Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Global.mRemote.My.Resources.Resources.Panels + Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Global.mRemoteNG.My.Resources.Resources.Panels Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Name = "cMenTreeConnectWithOptionsChoosePanelBeforeConnecting" Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Size = New System.Drawing.Size(231, 22) Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = "Choose panel before connecting" ' 'cMenTreeDisconnect ' - Me.cMenTreeDisconnect.Image = Global.mRemote.My.Resources.Resources.Pause + Me.cMenTreeDisconnect.Image = Global.mRemoteNG.My.Resources.Resources.Pause Me.cMenTreeDisconnect.Name = "cMenTreeDisconnect" Me.cMenTreeDisconnect.Size = New System.Drawing.Size(186, 22) Me.cMenTreeDisconnect.Text = "Disconnect" @@ -205,14 +205,14 @@ Namespace UI 'cMenTreeTools ' Me.cMenTreeTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenTreeToolsTransferFile, Me.cMenTreeToolsImportExport, Me.cMenTreeToolsSort, Me.cMenTreeToolsExternalApps}) - Me.cMenTreeTools.Image = Global.mRemote.My.Resources.Resources.Tools + Me.cMenTreeTools.Image = Global.mRemoteNG.My.Resources.Resources.Tools Me.cMenTreeTools.Name = "cMenTreeTools" Me.cMenTreeTools.Size = New System.Drawing.Size(186, 22) Me.cMenTreeTools.Text = "Tools" ' 'cMenTreeToolsTransferFile ' - Me.cMenTreeToolsTransferFile.Image = Global.mRemote.My.Resources.Resources.SSHTransfer + Me.cMenTreeToolsTransferFile.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer Me.cMenTreeToolsTransferFile.Name = "cMenTreeToolsTransferFile" Me.cMenTreeToolsTransferFile.Size = New System.Drawing.Size(172, 22) Me.cMenTreeToolsTransferFile.Text = "Transfer File (SSH)" @@ -226,14 +226,14 @@ Namespace UI ' 'cMenTreeToolsImportExportExportmRemoteXML ' - Me.cMenTreeToolsImportExportExportmRemoteXML.Image = Global.mRemote.My.Resources.Resources.Connections_SaveAs + Me.cMenTreeToolsImportExportExportmRemoteXML.Image = Global.mRemoteNG.My.Resources.Resources.Connections_SaveAs Me.cMenTreeToolsImportExportExportmRemoteXML.Name = "cMenTreeToolsImportExportExportmRemoteXML" Me.cMenTreeToolsImportExportExportmRemoteXML.Size = New System.Drawing.Size(204, 22) Me.cMenTreeToolsImportExportExportmRemoteXML.Text = "Export mRemote XML" ' 'cMenTreeToolsImportExportImportmRemoteXML ' - Me.cMenTreeToolsImportExportImportmRemoteXML.Image = Global.mRemote.My.Resources.Resources.Connections_Load + Me.cMenTreeToolsImportExportImportmRemoteXML.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Load Me.cMenTreeToolsImportExportImportmRemoteXML.Name = "cMenTreeToolsImportExportImportmRemoteXML" Me.cMenTreeToolsImportExportImportmRemoteXML.Size = New System.Drawing.Size(204, 22) Me.cMenTreeToolsImportExportImportmRemoteXML.Text = "Import mRemote XML" @@ -245,21 +245,21 @@ Namespace UI ' 'cMenTreeToolsImportExportImportFromAD ' - Me.cMenTreeToolsImportExportImportFromAD.Image = Global.mRemote.My.Resources.Resources.ActiveDirectory + Me.cMenTreeToolsImportExportImportFromAD.Image = Global.mRemoteNG.My.Resources.Resources.ActiveDirectory Me.cMenTreeToolsImportExportImportFromAD.Name = "cMenTreeToolsImportExportImportFromAD" Me.cMenTreeToolsImportExportImportFromAD.Size = New System.Drawing.Size(204, 22) Me.cMenTreeToolsImportExportImportFromAD.Text = "Import from Active Directory" ' 'cMenTreeToolsImportExportImportFromRDPFiles ' - Me.cMenTreeToolsImportExportImportFromRDPFiles.Image = Global.mRemote.My.Resources.Resources.RDP + Me.cMenTreeToolsImportExportImportFromRDPFiles.Image = Global.mRemoteNG.My.Resources.Resources.RDP Me.cMenTreeToolsImportExportImportFromRDPFiles.Name = "cMenTreeToolsImportExportImportFromRDPFiles" Me.cMenTreeToolsImportExportImportFromRDPFiles.Size = New System.Drawing.Size(204, 22) Me.cMenTreeToolsImportExportImportFromRDPFiles.Text = "Import from .RDP file(s)" ' 'cMenTreeToolsImportExportImportFromPortScan ' - Me.cMenTreeToolsImportExportImportFromPortScan.Image = Global.mRemote.My.Resources.Resources.PortScan + Me.cMenTreeToolsImportExportImportFromPortScan.Image = Global.mRemoteNG.My.Resources.Resources.PortScan Me.cMenTreeToolsImportExportImportFromPortScan.Name = "cMenTreeToolsImportExportImportFromPortScan" Me.cMenTreeToolsImportExportImportFromPortScan.Size = New System.Drawing.Size(204, 22) Me.cMenTreeToolsImportExportImportFromPortScan.Text = "Import from Port Scan" @@ -273,21 +273,21 @@ Namespace UI ' 'cMenTreeToolsSortAscending ' - Me.cMenTreeToolsSortAscending.Image = Global.mRemote.My.Resources.Resources.Sort_AZ + Me.cMenTreeToolsSortAscending.Image = Global.mRemoteNG.My.Resources.Resources.Sort_AZ Me.cMenTreeToolsSortAscending.Name = "cMenTreeToolsSortAscending" Me.cMenTreeToolsSortAscending.Size = New System.Drawing.Size(157, 22) Me.cMenTreeToolsSortAscending.Text = "Ascending (A-Z)" ' 'cMenTreeToolsSortDescending ' - Me.cMenTreeToolsSortDescending.Image = Global.mRemote.My.Resources.Resources.Sort_ZA + Me.cMenTreeToolsSortDescending.Image = Global.mRemoteNG.My.Resources.Resources.Sort_ZA Me.cMenTreeToolsSortDescending.Name = "cMenTreeToolsSortDescending" Me.cMenTreeToolsSortDescending.Size = New System.Drawing.Size(157, 22) Me.cMenTreeToolsSortDescending.Text = "Descending (Z-A)" ' 'cMenTreeToolsExternalApps ' - Me.cMenTreeToolsExternalApps.Image = Global.mRemote.My.Resources.Resources.ExtApp + Me.cMenTreeToolsExternalApps.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp Me.cMenTreeToolsExternalApps.Name = "cMenTreeToolsExternalApps" Me.cMenTreeToolsExternalApps.Size = New System.Drawing.Size(172, 22) Me.cMenTreeToolsExternalApps.Text = "External Applications" @@ -299,7 +299,7 @@ Namespace UI ' 'cMenTreeDuplicate ' - Me.cMenTreeDuplicate.Image = Global.mRemote.My.Resources.Resources.Connection_Duplicate + Me.cMenTreeDuplicate.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Duplicate Me.cMenTreeDuplicate.Name = "cMenTreeDuplicate" Me.cMenTreeDuplicate.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.D), System.Windows.Forms.Keys) Me.cMenTreeDuplicate.Size = New System.Drawing.Size(186, 22) @@ -307,7 +307,7 @@ Namespace UI ' 'cMenTreeRename ' - Me.cMenTreeRename.Image = Global.mRemote.My.Resources.Resources.Rename + Me.cMenTreeRename.Image = Global.mRemoteNG.My.Resources.Resources.Rename Me.cMenTreeRename.Name = "cMenTreeRename" Me.cMenTreeRename.ShortcutKeys = System.Windows.Forms.Keys.F2 Me.cMenTreeRename.Size = New System.Drawing.Size(186, 22) @@ -315,7 +315,7 @@ Namespace UI ' 'cMenTreeDelete ' - Me.cMenTreeDelete.Image = Global.mRemote.My.Resources.Resources.Delete + Me.cMenTreeDelete.Image = Global.mRemoteNG.My.Resources.Resources.Delete Me.cMenTreeDelete.Name = "cMenTreeDelete" Me.cMenTreeDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete Me.cMenTreeDelete.Size = New System.Drawing.Size(186, 22) @@ -328,7 +328,7 @@ Namespace UI ' 'cMenTreeMoveUp ' - Me.cMenTreeMoveUp.Image = Global.mRemote.My.Resources.Resources.Arrow_Up + Me.cMenTreeMoveUp.Image = Global.mRemoteNG.My.Resources.Resources.Arrow_Up Me.cMenTreeMoveUp.Name = "cMenTreeMoveUp" Me.cMenTreeMoveUp.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Up), System.Windows.Forms.Keys) Me.cMenTreeMoveUp.Size = New System.Drawing.Size(186, 22) @@ -336,7 +336,7 @@ Namespace UI ' 'cMenTreeMoveDown ' - Me.cMenTreeMoveDown.Image = Global.mRemote.My.Resources.Resources.Arrow_Down + Me.cMenTreeMoveDown.Image = Global.mRemoteNG.My.Resources.Resources.Arrow_Down Me.cMenTreeMoveDown.Name = "cMenTreeMoveDown" Me.cMenTreeMoveDown.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Down), System.Windows.Forms.Keys) Me.cMenTreeMoveDown.Size = New System.Drawing.Size(186, 22) @@ -364,7 +364,7 @@ Namespace UI 'PictureBox1 ' Me.PictureBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.PictureBox1.Image = Global.mRemote.My.Resources.Resources.Search + Me.PictureBox1.Image = Global.mRemoteNG.My.Resources.Resources.Search Me.PictureBox1.Location = New System.Drawing.Point(0, 411) Me.PictureBox1.Name = "PictureBox1" Me.PictureBox1.Size = New System.Drawing.Size(16, 16) @@ -398,21 +398,21 @@ Namespace UI ' Me.mMenView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image Me.mMenView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewExpandAllFolders, Me.mMenViewCollapseAllFolders}) - Me.mMenView.Image = Global.mRemote.My.Resources.Resources.View + Me.mMenView.Image = Global.mRemoteNG.My.Resources.Resources.View Me.mMenView.Name = "mMenView" Me.mMenView.Size = New System.Drawing.Size(28, 20) Me.mMenView.Text = "&View" ' 'mMenViewExpandAllFolders ' - Me.mMenViewExpandAllFolders.Image = Global.mRemote.My.Resources.Resources.Expand + Me.mMenViewExpandAllFolders.Image = Global.mRemoteNG.My.Resources.Resources.Expand Me.mMenViewExpandAllFolders.Name = "mMenViewExpandAllFolders" Me.mMenViewExpandAllFolders.Size = New System.Drawing.Size(161, 22) Me.mMenViewExpandAllFolders.Text = "Expand all folders" ' 'mMenViewCollapseAllFolders ' - Me.mMenViewCollapseAllFolders.Image = Global.mRemote.My.Resources.Resources.Collapse + Me.mMenViewCollapseAllFolders.Image = Global.mRemoteNG.My.Resources.Resources.Collapse Me.mMenViewCollapseAllFolders.Name = "mMenViewCollapseAllFolders" Me.mMenViewCollapseAllFolders.Size = New System.Drawing.Size(161, 22) Me.mMenViewCollapseAllFolders.Text = "Collapse all folders" @@ -424,7 +424,7 @@ Namespace UI Me.Controls.Add(Me.pnlConnections) Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.HideOnClose = True - Me.Icon = Global.mRemote.My.Resources.Resources.Root_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Root_Icon Me.Name = "Tree" Me.TabText = "Connections" Me.Text = "Connections" @@ -556,11 +556,11 @@ Namespace UI Try If My.Settings.SetHostnameLikeDisplayName Then If e.Node.Text = My.Resources.strNewConnection Then - TryCast(e.Node.Tag, mRemote.Connection.Info).Hostname = e.Label + TryCast(e.Node.Tag, mRemoteNG.Connection.Info).Hostname = e.Label End If End If - mRemote.Tree.Node.FinishRenameSelectedNode(e.Label) + mRemoteNG.Tree.Node.FinishRenameSelectedNode(e.Label) Windows.configForm.pGrid_SelectedObjectChanged() Me.ShowHideTreeContextMenuItems(e.Node) SaveConnectionsBG() @@ -571,13 +571,13 @@ Namespace UI Private Sub tvConnections_AfterSelect(ByVal sender As Object, ByVal e As System.Windows.Forms.TreeViewEventArgs) Handles tvConnections.AfterSelect Try - Select Case mRemote.Tree.Node.GetNodeType(e.Node) - Case mRemote.Tree.Node.Type.Connection + Select Case mRemoteNG.Tree.Node.GetNodeType(e.Node) + Case mRemoteNG.Tree.Node.Type.Connection Windows.configForm.SetPropertyGridObject(e.Node.Tag) - Windows.sessionsForm.CurrentHost = TryCast(e.Node.Tag, mRemote.Connection.Info).Hostname - Case mRemote.Tree.Node.Type.Container - Windows.configForm.SetPropertyGridObject(TryCast(e.Node.Tag, mRemote.Container.Info).ConnectionInfo) - Case mRemote.Tree.Node.Type.Root + Windows.sessionsForm.CurrentHost = TryCast(e.Node.Tag, mRemoteNG.Connection.Info).Hostname + Case mRemoteNG.Tree.Node.Type.Container + Windows.configForm.SetPropertyGridObject(TryCast(e.Node.Tag, mRemoteNG.Container.Info).ConnectionInfo) + Case mRemoteNG.Tree.Node.Type.Root Windows.configForm.SetPropertyGridObject(e.Node.Tag) Case Else Exit Sub @@ -587,7 +587,7 @@ Namespace UI Me.ShowHideTreeContextMenuItems(e.Node) Windows.sessionsForm.GetSessionsAuto() - App.Runtime.LastSelected = mRemote.Tree.Node.GetConstantID(e.Node) + App.Runtime.LastSelected = mRemoteNG.Tree.Node.GetConstantID(e.Node) Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterSelect (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try @@ -599,11 +599,11 @@ Namespace UI Me.tvConnections.SelectedNode = e.Node If e.Button = System.Windows.Forms.MouseButtons.Left Then - If My.Settings.SingleClickOnConnectionOpensIt And mRemote.Tree.Node.GetNodeType(e.Node) = mRemote.Tree.Node.Type.Connection Then + If My.Settings.SingleClickOnConnectionOpensIt And mRemoteNG.Tree.Node.GetNodeType(e.Node) = mRemoteNG.Tree.Node.Type.Connection Then App.Runtime.OpenConnection() End If - If My.Settings.SingleClickSwitchesToOpenConnection And mRemote.Tree.Node.GetNodeType(e.Node) = mRemote.Tree.Node.Type.Connection Then + If My.Settings.SingleClickSwitchesToOpenConnection And mRemoteNG.Tree.Node.GetNodeType(e.Node) = mRemoteNG.Tree.Node.Type.Connection Then App.Runtime.SwitchToOpenConnection(e.Node.Tag) End If End If @@ -613,23 +613,23 @@ Namespace UI End Sub Private Sub tvConnections_NodeMouseDoubleClick(ByVal sender As Object, ByVal e As System.Windows.Forms.TreeNodeMouseClickEventArgs) Handles tvConnections.NodeMouseDoubleClick - If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) = mRemote.Tree.Node.Type.Connection Then + If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then App.Runtime.OpenConnection() End If End Sub Private Sub tvConnections_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles tvConnections.MouseMove Try - mRemote.Tree.Node.SetNodeToolTip(e, Me.DescriptionTooltip) + mRemoteNG.Tree.Node.SetNodeToolTip(e, Me.DescriptionTooltip) Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_MouseMove (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub - Private Function IsConnectionOpen(ByVal ConnectionInfos() As mRemote.Connection.Info) As Boolean + Private Function IsConnectionOpen(ByVal ConnectionInfos() As mRemoteNG.Connection.Info) As Boolean Try If ConnectionInfos IsNot Nothing Then - For Each conI As mRemote.Connection.Info In ConnectionInfos + For Each conI As mRemoteNG.Connection.Info In ConnectionInfos If conI.OpenConnections.Count > 0 Then Return True End If @@ -650,29 +650,29 @@ Namespace UI Exit Sub End If - Select Case mRemote.Tree.Node.GetNodeType(tNode) - Case mRemote.Tree.Node.Type.Connection - Dim conI As mRemote.Connection.Info = tNode.Tag + Select Case mRemoteNG.Tree.Node.GetNodeType(tNode) + Case mRemoteNG.Tree.Node.Type.Connection + Dim conI As mRemoteNG.Connection.Info = tNode.Tag Me.cMenTreeConnect.Enabled = True Me.cMenTreeConnectWithOptions.Enabled = True - If TryCast(tNode.Tag, mRemote.Connection.Info).OpenConnections.Count > 0 Then + If TryCast(tNode.Tag, mRemoteNG.Connection.Info).OpenConnections.Count > 0 Then Me.cMenTreeDisconnect.Enabled = True Else Me.cMenTreeDisconnect.Enabled = False End If - If conI.Protocol = mRemote.Connection.Protocol.Protocols.SSH1 Or conI.Protocol = mRemote.Connection.Protocol.Protocols.SSH2 Then + If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH1 Or conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH2 Then Me.cMenTreeToolsTransferFile.Enabled = True Else Me.cMenTreeToolsTransferFile.Enabled = False End If - If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then + If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = True Me.cMenTreeConnectWithOptionsConnectToConsoleSession.Enabled = True - ElseIf conI.Protocol = mRemote.Connection.Protocol.Protocols.ICA Then + ElseIf conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.ICA Then Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = True Me.cMenTreeConnectWithOptionsConnectToConsoleSession.Enabled = False Else @@ -694,7 +694,7 @@ Namespace UI Me.cMenTreeMoveUp.Enabled = True Me.cMenTreeMoveDown.Enabled = True - Case mRemote.Tree.Node.Type.Container + Case mRemoteNG.Tree.Node.Type.Container Me.cMenTreeConnect.Enabled = True Me.cMenTreeConnectWithOptions.Enabled = True Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = False @@ -703,8 +703,8 @@ Namespace UI Me.cMenTreeDisconnect.Enabled = False For Each n As TreeNode In tNode.Nodes - If TypeOf n.Tag Is mRemote.Connection.Info Then - Dim cI As mRemote.Connection.Info = n.Tag + If TypeOf n.Tag Is mRemoteNG.Connection.Info Then + Dim cI As mRemoteNG.Connection.Info = n.Tag If cI.OpenConnections.Count > 0 Then Me.cMenTreeDisconnect.Enabled = True Exit For @@ -728,7 +728,7 @@ Namespace UI Me.cMenTreeMoveUp.Enabled = True Me.cMenTreeMoveDown.Enabled = True - Case mRemote.Tree.Node.Type.Root + Case mRemoteNG.Tree.Node.Type.Root Me.cMenTreeConnect.Enabled = False Me.cMenTreeConnectWithOptions.Enabled = False Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = False @@ -784,7 +784,7 @@ Namespace UI Exit Sub End If - If mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Root Then + If mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Root Then Exit Sub End If @@ -800,21 +800,21 @@ Namespace UI 'the TreeView root nodes, otherwise add it to the end of 'the dropNode child nodes - If mRemote.Tree.Node.GetNodeType(targetNode) = mRemote.Tree.Node.Type.Root Or mRemote.Tree.Node.GetNodeType(targetNode) = mRemote.Tree.Node.Type.Container Then + If mRemoteNG.Tree.Node.GetNodeType(targetNode) = mRemoteNG.Tree.Node.Type.Root Or mRemoteNG.Tree.Node.GetNodeType(targetNode) = mRemoteNG.Tree.Node.Type.Container Then targetNode.Nodes.Insert(0, dropNode) Else targetNode.Parent.Nodes.Insert(targetNode.Index + 1, dropNode) End If - If mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Connection Or mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Container Then - If mRemote.Tree.Node.GetNodeType(dropNode.Parent) = mRemote.Tree.Node.Type.Container Then + If mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Connection Or mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Container Then + If mRemoteNG.Tree.Node.GetNodeType(dropNode.Parent) = mRemoteNG.Tree.Node.Type.Container Then dropNode.Tag.Parent = dropNode.Parent.Tag - ElseIf mRemote.Tree.Node.GetNodeType(dropNode.Parent) = mRemote.Tree.Node.Type.Root Then + ElseIf mRemoteNG.Tree.Node.GetNodeType(dropNode.Parent) = mRemoteNG.Tree.Node.Type.Root Then dropNode.Tag.Parent = Nothing - If mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Connection Then - dropNode.Tag.Inherit = New mRemote.Connection.Info.Inheritance(dropNode.Tag, False) - ElseIf mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Container Then - dropNode.Tag.ConnectionInfo.Inherit = New mRemote.Connection.Info.Inheritance(dropNode.Tag.ConnectionInfo, False) + If mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Connection Then + dropNode.Tag.Inherit = New mRemoteNG.Connection.Info.Inheritance(dropNode.Tag, False) + ElseIf mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Container Then + dropNode.Tag.ConnectionInfo.Inherit = New mRemoteNG.Connection.Info.Inheritance(dropNode.Tag.ConnectionInfo, False) End If End If End If @@ -921,23 +921,23 @@ Namespace UI End Sub Private Sub cMenTreeConnect_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnect.Click - App.Runtime.OpenConnection(mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.DoNotJump) End Sub Private Sub cMenTreeConnectWithOptionsConnectToConsoleSession_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsConnectToConsoleSession.Click - App.Runtime.OpenConnection(mRemote.Connection.Info.Force.UseConsoleSession Or mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.UseConsoleSession Or mRemoteNG.Connection.Info.Force.DoNotJump) End Sub Private Sub cMenTreeConnectWithOptionsDontConnectToConsoleSession_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsDontConnectToConsoleSession.Click - App.Runtime.OpenConnection(mRemote.Connection.Info.Force.DontUseConsoleSession Or mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.DontUseConsoleSession Or mRemoteNG.Connection.Info.Force.DoNotJump) End Sub Private Sub cMenTreeConnectWithOptionsConnectInFullscreen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsConnectInFullscreen.Click - App.Runtime.OpenConnection(mRemote.Connection.Info.Force.Fullscreen Or mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.Fullscreen Or mRemoteNG.Connection.Info.Force.DoNotJump) End Sub Private Sub cMenTreeConnectWithOptionsChoosePanelBeforeConnecting_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Click - App.Runtime.OpenConnection(mRemote.Connection.Info.Force.OverridePanel Or mRemote.Connection.Info.Force.DoNotJump) + App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.OverridePanel Or mRemoteNG.Connection.Info.Force.DoNotJump) End Sub Private Sub cMenTreeDisconnect_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeDisconnect.Click @@ -969,12 +969,12 @@ Namespace UI End Sub Private Sub cMenTreeToolsSortAscending_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeToolsSortAscending.Click - mRemote.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Ascending) + mRemoteNG.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Ascending) SaveConnectionsBG() End Sub Private Sub cMenTreeToolsSortDescending_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeToolsSortDescending.Click - mRemote.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Descending) + mRemoteNG.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Descending) SaveConnectionsBG() End Sub @@ -987,27 +987,27 @@ Namespace UI End Sub Private Sub cMenTreeDuplicate_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeDuplicate.Click - mRemote.Tree.Node.CloneNode(tvConnections.SelectedNode) + mRemoteNG.Tree.Node.CloneNode(tvConnections.SelectedNode) SaveConnectionsBG() End Sub Private Sub cMenTreeRename_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeRename.Click - mRemote.Tree.Node.StartRenameSelectedNode() + mRemoteNG.Tree.Node.StartRenameSelectedNode() SaveConnectionsBG() End Sub Private Sub cMenTreeDelete_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeDelete.Click - mRemote.Tree.Node.DeleteSelectedNode() + mRemoteNG.Tree.Node.DeleteSelectedNode() SaveConnectionsBG() End Sub Private Sub cMenTreeMoveUp_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeMoveUp.Click - mRemote.Tree.Node.MoveNodeUp() + mRemoteNG.Tree.Node.MoveNodeUp() SaveConnectionsBG() End Sub Private Sub cMenTreeMoveDown_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeMoveDown.Click - mRemote.Tree.Node.MoveNodeDown() + mRemoteNG.Tree.Node.MoveNodeDown() SaveConnectionsBG() End Sub #End Region @@ -1015,11 +1015,11 @@ Namespace UI #Region "Context Menu Actions" Public Sub AddConnection() Try - Dim nNode As TreeNode = mRemote.Tree.Node.AddNode(mRemote.Tree.Node.Type.Connection) + Dim nNode As TreeNode = mRemoteNG.Tree.Node.AddNode(mRemoteNG.Tree.Node.Type.Connection) If nNode IsNot Nothing Then - Dim nConI As New mRemote.Connection.Info() - If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Container.Info Then + Dim nConI As New mRemoteNG.Connection.Info() + If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Container.Info Then nConI.Parent = Me.tvConnections.SelectedNode.Tag Else nConI.Inherit.TurnOffInheritanceCompletely() @@ -1030,7 +1030,7 @@ Namespace UI nNode.Tag = nConI cL.Add(nConI) - If mRemote.Tree.Node.GetNodeType(Me.tvConnections.SelectedNode) = mRemote.Tree.Node.Type.Connection Then + If mRemoteNG.Tree.Node.GetNodeType(Me.tvConnections.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then Me.tvConnections.SelectedNode.Parent.Nodes.Add(nNode) Else Me.tvConnections.SelectedNode.Nodes.Add(nNode) @@ -1046,27 +1046,27 @@ Namespace UI Public Sub AddFolder() Try - Dim nNode As TreeNode = mRemote.Tree.Node.AddNode(mRemote.Tree.Node.Type.Container) + Dim nNode As TreeNode = mRemoteNG.Tree.Node.AddNode(mRemoteNG.Tree.Node.Type.Container) If nNode IsNot Nothing Then - Dim nContI As New mRemote.Container.Info() - If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) = mRemote.Tree.Node.Type.Container Then - nContI.Parent = mRemote.Tree.Node.SelectedNode.Tag + Dim nContI As New mRemoteNG.Container.Info() + If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) = mRemoteNG.Tree.Node.Type.Container Then + nContI.Parent = mRemoteNG.Tree.Node.SelectedNode.Tag Else nContI.ConnectionInfo.Inherit.TurnOffInheritanceCompletely() End If nContI.TreeNode = nNode - nContI.ConnectionInfo = New mRemote.Connection.Info(nContI) + nContI.ConnectionInfo = New mRemoteNG.Connection.Info(nContI) - If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) <> mRemote.Tree.Node.Type.Container Then + If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) <> mRemoteNG.Tree.Node.Type.Container Then nContI.ConnectionInfo.Inherit.TurnOffInheritanceCompletely() End If nNode.Tag = nContI ctL.Add(nContI) - If mRemote.Tree.Node.GetNodeType(Me.tvConnections.SelectedNode) = mRemote.Tree.Node.Type.Connection Then + If mRemoteNG.Tree.Node.GetNodeType(Me.tvConnections.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then Me.tvConnections.SelectedNode.Parent.Nodes.Add(nNode) Else Me.tvConnections.SelectedNode.Nodes.Add(nNode) @@ -1083,17 +1083,17 @@ Namespace UI Private Sub DisconnectConnection() Try If Me.tvConnections.SelectedNode IsNot Nothing Then - If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Connection.Info Then - Dim conI As mRemote.Connection.Info = Me.tvConnections.SelectedNode.Tag + If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Connection.Info Then + Dim conI As mRemoteNG.Connection.Info = Me.tvConnections.SelectedNode.Tag For i As Integer = 0 To conI.OpenConnections.Count - 1 conI.OpenConnections(i).Disconnect() Next End If - If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Container.Info Then + If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Container.Info Then For Each n As TreeNode In Me.tvConnections.SelectedNode.Nodes - If TypeOf n.Tag Is mRemote.Connection.Info Then - Dim conI As mRemote.Connection.Info = n.Tag + If TypeOf n.Tag Is mRemoteNG.Connection.Info Then + Dim conI As mRemoteNG.Connection.Info = n.Tag For i As Integer = 0 To conI.OpenConnections.Count - 1 conI.OpenConnections(i).Disconnect() Next @@ -1110,7 +1110,7 @@ Namespace UI Try Windows.Show(Type.SSHTransfer) - Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag + Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag Windows.sshtransferForm.Hostname = conI.Hostname Windows.sshtransferForm.Username = conI.Username @@ -1196,8 +1196,8 @@ Namespace UI Private Sub StartExternalApp(ByVal ExtA As Tools.ExternalApp) Try - If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) = mRemote.Tree.Node.Type.Connection Then - ExtA.Start(mRemote.Tree.Node.SelectedNode.Tag) + If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then + ExtA.Start(mRemoteNG.Tree.Node.SelectedNode.Tag) End If Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeToolsExternalAppsEntry_Click failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) @@ -1207,11 +1207,11 @@ Namespace UI #Region "Menu" Private Sub mMenViewExpandAllFolders_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewExpandAllFolders.Click - mRemote.Tree.Node.ExpandAllNodes() + mRemoteNG.Tree.Node.ExpandAllNodes() End Sub Private Sub mMenViewCollapseAllFolders_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewCollapseAllFolders.Click - mRemote.Tree.Node.CollapseAllNodes() + mRemoteNG.Tree.Node.CollapseAllNodes() End Sub #End Region @@ -1234,7 +1234,7 @@ Namespace UI End Sub Private Sub txtSearch_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtSearch.TextChanged - Me.tvConnections.SelectedNode = mRemote.Tree.Node.Find(Me.tvConnections.Nodes(0), Me.txtSearch.Text) + Me.tvConnections.SelectedNode = mRemoteNG.Tree.Node.Find(Me.tvConnections.Nodes(0), Me.txtSearch.Text) End Sub Private Sub tvConnections_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles tvConnections.KeyPress @@ -1253,7 +1253,7 @@ Namespace UI Private Sub tvConnections_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles tvConnections.KeyDown Try If e.KeyCode = Keys.Enter Then - If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Connection.Info Then + If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Connection.Info Then e.Handled = True App.Runtime.OpenConnection() Else diff --git a/mRemoteV1/UI/UI.Window.UltraVNCSC.vb b/mRemoteV1/UI/UI.Window.UltraVNCSC.vb index c6a8d957..3aa40c3a 100644 --- a/mRemoteV1/UI/UI.Window.UltraVNCSC.vb +++ b/mRemoteV1/UI/UI.Window.UltraVNCSC.vb @@ -1,6 +1,5 @@ Imports WeifenLuo.WinFormsUI.Docking -Imports mRemote.App.Runtime -'Imports AxViewerX +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -54,7 +53,7 @@ Namespace UI Me.ClientSize = New System.Drawing.Size(446, 362) Me.Controls.Add(Me.pnlContainer) Me.Controls.Add(Me.tsMain) - Me.Icon = Global.mRemote.My.Resources.UVNC_SC_Icon + Me.Icon = Global.mRemoteNG.My.Resources.UVNC_SC_Icon Me.Name = "UltraVNCSC" Me.TabText = "UltraVNC SC" Me.Text = "UltraVNC SC" @@ -110,7 +109,7 @@ Namespace UI Catch ex As Exception mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" & vbNewLine & ex.Message, False) Close() - End Try + End Try End Sub Private Sub SetupLicense() diff --git a/mRemoteV1/UI/UI.Window.Update.vb b/mRemoteV1/UI/UI.Window.Update.vb index 09815d16..6611edb9 100644 --- a/mRemoteV1/UI/UI.Window.Update.vb +++ b/mRemoteV1/UI/UI.Window.Update.vb @@ -1,7 +1,7 @@ Imports WeifenLuo.WinFormsUI.Docking Imports System.Threading Imports System.IO -Imports mRemote.App.Runtime +Imports mRemoteNG.App.Runtime Namespace UI Namespace Window @@ -182,7 +182,7 @@ Namespace UI Me.Controls.Add(Me.lblCurrentVersion) Me.Controls.Add(Me.pnlUp) Me.Controls.Add(Me.lblStatus) - Me.Icon = Global.mRemote.My.Resources.Resources.Update_Icon + Me.Icon = Global.mRemoteNG.My.Resources.Resources.Update_Icon Me.Name = "Update" Me.TabText = "Update" Me.Text = "Update" diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config index 9ac62441..f6fed6c2 100644 --- a/mRemoteV1/app.config +++ b/mRemoteV1/app.config @@ -1,13 +1,12 @@  - -
- -
+ +
+ -
+
@@ -21,15 +20,15 @@ - + -
-