From 036b90370faaf5a5607fac05810092769241a1f3 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Sun, 5 Jun 2011 01:54:47 -0500 Subject: [PATCH] Code cleanup. --- mRemoteV1/App/App.Announcement.vb | 6 +- mRemoteV1/App/App.Runtime.vb | 595 ++++++++++++------ mRemoteV1/App/App.Update.vb | 16 +- mRemoteV1/ApplicationEvents.vb | 1 - mRemoteV1/Config/Config.Connections.Load.vb | 26 +- mRemoteV1/Config/Config.Connections.Save.vb | 22 +- mRemoteV1/Config/Config.Settings.Load.vb | 4 +- mRemoteV1/Config/Config.Settings.Save.vb | 60 +- mRemoteV1/Connection/Connection.Icon.vb | 2 +- mRemoteV1/Connection/Connection.Info.vb | 2 +- .../Connection/Connection.InterfaceControl.vb | 2 +- .../Connection/Connection.Protocol.Base.vb | 10 +- .../Connection.Protocol.HTTPBase.vb | 8 +- .../Connection/Connection.Protocol.ICA.vb | 12 +- .../Connection/Connection.Protocol.IntApp.vb | 18 +- .../Connection.Protocol.PuttyBase.vb | 24 +- .../Connection/Connection.Protocol.RDP.vb | 64 +- .../Connection/Connection.Protocol.VNC.vb | 18 +- .../Connection/Connection.QuickConnect.vb | 4 +- mRemoteV1/Forms/frmChoosePanel.vb | 4 +- mRemoteV1/Forms/frmMain.vb | 49 +- mRemoteV1/Forms/frmOptions.vb | 14 +- mRemoteV1/Security/Security.Crypt.vb | 4 +- mRemoteV1/Security/Security.Impersonator.vb | 4 +- mRemoteV1/Tools/Tools.Controls.vb | 12 +- mRemoteV1/Tools/Tools.ExternalApp.vb | 4 +- mRemoteV1/Tools/Tools.Misc.vb | 18 +- mRemoteV1/Tools/Tools.PortScan.vb | 10 +- mRemoteV1/Tree/Tree.Node.vb | 32 +- mRemoteV1/UI/UI.Window.About.vb | 2 +- mRemoteV1/UI/UI.Window.Announcment.vb | 6 +- mRemoteV1/UI/UI.Window.ComponentsCheck.vb | 22 +- mRemoteV1/UI/UI.Window.Config.vb | 14 +- mRemoteV1/UI/UI.Window.Connection.vb | 58 +- mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb | 16 +- mRemoteV1/UI/UI.Window.ExternalApps.vb | 18 +- mRemoteV1/UI/UI.Window.PortScan.vb | 12 +- mRemoteV1/UI/UI.Window.QuickConnect.vb | 4 +- mRemoteV1/UI/UI.Window.SSHTransfer.vb | 12 +- mRemoteV1/UI/UI.Window.SaveAs.vb | 2 +- mRemoteV1/UI/UI.Window.ScreenshotManager.vb | 12 +- mRemoteV1/UI/UI.Window.Sessions.vb | 10 +- mRemoteV1/UI/UI.Window.Tree.vb | 52 +- mRemoteV1/UI/UI.Window.UltraVNCSC.vb | 4 +- mRemoteV1/UI/UI.Window.Update.vb | 16 +- 45 files changed, 742 insertions(+), 563 deletions(-) diff --git a/mRemoteV1/App/App.Announcement.vb b/mRemoteV1/App/App.Announcement.vb index 374f4fb7..caf94e2e 100644 --- a/mRemoteV1/App/App.Announcement.vb +++ b/mRemoteV1/App/App.Announcement.vb @@ -29,7 +29,7 @@ Namespace App Return False End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncementAvailable failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncementAvailable failed" & vbNewLine & ex.Message, True) Return False End Try End Function @@ -68,7 +68,7 @@ Namespace App _curAI = aI Return aI Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting Announcement info failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Getting Announcement info failed" & vbNewLine & ex.Message, True) Return Nothing End Try End Function @@ -87,7 +87,7 @@ Namespace App Return strTemp Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "GetAnnouncementFile failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetAnnouncementFile failed" & vbNewLine & ex.Message, True) Return "" End Try End Function diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index 7a1c24f3..e549c7c1 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -1,47 +1,244 @@ -Imports WeifenLuo.WinFormsUI.Docking +Imports log4net +Imports mRemoteNG.Messages +Imports mRemoteNG.Connection +Imports mRemoteNG.Config.Settings +Imports mRemoteNG.Tools +Imports WeifenLuo.WinFormsUI.Docking Imports System.IO Imports Crownwood Imports System.Threading Imports System.Xml Imports System.Environment Imports System.Management +Imports Timer = System.Timers.Timer Namespace App Public Class Runtime -#Region "Public Declarations" - Public Shared sL As Config.Settings.Load - Public Shared sS As Config.Settings.Save +#Region "Public Properties" + 'Private Shared _settingsLoad As Config.Settings.Load + 'Public Shared Property SettingsLoad() As Load + ' Get + ' Return _settingsLoad + ' End Get + ' Set(ByVal value As Load) + ' _settingsLoad = value + ' End Set + 'End Property - Public Shared connectionList As Connection.List - Public Shared prevCL As Connection.List - Public Shared containerList As Container.List - Public Shared prevCTL As Container.List - Public Shared crL As Credential.List - Public Shared prevCRL As Credential.List + 'Private Shared _settingsSave As Config.Settings.Save + 'Public Shared Property SettingsSave() As Save + ' Get + ' Return _settingsSave + ' End Get + ' Set(ByVal value As Save) + ' _settingsSave = value + ' End Set + 'End Property - Public Shared wL As UI.Window.List - Public Shared mC As Messages.Collector + Private Shared _connectionList As Connection.List + Public Shared Property ConnectionList() As List + Get + Return _connectionList + End Get + Set(ByVal value As List) + _connectionList = value + End Set + End Property - Public Shared SysTrayIcon As Tools.Controls.SysTrayIcon - Public Shared SysMenu As Tools.SystemMenu + Private Shared _previousConnectionList As Connection.List + Public Shared Property PreviousConnectionList() As List + Get + Return _previousConnectionList + End Get + Set(ByVal value As List) + _previousConnectionList = value + End Set + End Property - Public Shared log As log4net.ILog + Private Shared _containerList As Container.List + Public Shared Property ContainerList() As Container.List + Get + Return _containerList + End Get + Set(ByVal value As Container.List) + _containerList = value + End Set + End Property - Public Shared IsUpdateAvailable As Boolean - Public Shared IsAnnouncementAvailable As Boolean - Public Shared ConnectionsFileLoaded As Boolean + Private Shared _previousContainerList As Container.List + Public Shared Property PreviousContainerList() As Container.List + Get + Return _previousContainerList + End Get + Set(ByVal value As Container.List) + _previousContainerList = value + End Set + End Property - Public Shared WithEvents tmrSqlWatcher As Timers.Timer - Public Shared LastSQLUpdate As Date + Private Shared _credentialList As Credential.List + Public Shared Property CredentialList() As Credential.List + Get + Return _credentialList + End Get + Set(ByVal value As Credential.List) + _credentialList = value + End Set + End Property - Public Shared LastSelected As String + Private Shared _previousCredentialList As Credential.List + Public Shared Property PreviousCredentialList() As Credential.List + Get + Return _previousCredentialList + End Get + Set(ByVal value As Credential.List) + _previousCredentialList = value + End Set + End Property - Public Shared DefaultConnection As mRemoteNG.Connection.Info - Public Shared DefaultInheritance As mRemoteNG.Connection.Info.Inheritance - Public Shared ExtApps As New ArrayList() + Private Shared _windowList As UI.Window.List + Public Shared Property WindowList() As UI.Window.List + Get + Return _windowList + End Get + Set(ByVal value As UI.Window.List) + _windowList = value + End Set + End Property + + Private Shared _messageCollector As Messages.Collector + Public Shared Property MessageCollector() As Collector + Get + Return _messageCollector + End Get + Set(ByVal value As Collector) + _messageCollector = value + End Set + End Property + + Private Shared _notificationAreaIcon As Tools.Controls.NotificationAreaIcon + Public Shared Property NotificationAreaIcon() As Controls.NotificationAreaIcon + Get + Return _notificationAreaIcon + End Get + Set(ByVal value As Controls.NotificationAreaIcon) + _notificationAreaIcon = value + End Set + End Property + + Private Shared _systemMenu As Tools.SystemMenu + Public Shared Property SystemMenu() As SystemMenu + Get + Return _systemMenu + End Get + Set(ByVal value As SystemMenu) + _systemMenu = value + End Set + End Property + + Private Shared _log As log4net.ILog + Public Shared Property Log() As ILog + Get + Return _log + End Get + Set(ByVal value As ILog) + _log = value + End Set + End Property + + Private Shared _isUpdateAvailable As Boolean + Public Shared Property IsUpdateAvailable() As Boolean + Get + Return _isUpdateAvailable + End Get + Set(ByVal value As Boolean) + _isUpdateAvailable = value + End Set + End Property + + Private Shared _isAnnouncementAvailable As Boolean + Public Shared Property IsAnnouncementAvailable() As Boolean + Get + Return _isAnnouncementAvailable + End Get + Set(ByVal value As Boolean) + _isAnnouncementAvailable = value + End Set + End Property + + Private Shared _isConnectionsFileLoaded As Boolean + Public Shared Property IsConnectionsFileLoaded() As Boolean + Get + Return _isConnectionsFileLoaded + End Get + Set(ByVal value As Boolean) + _isConnectionsFileLoaded = value + End Set + End Property + + Private Shared WithEvents _timerSqlWatcher As Timers.Timer + Public Shared Property TimerSqlWatcher() As Timer + Get + Return _timerSqlWatcher + End Get + Set(ByVal value As Timer) + _timerSqlWatcher = value + End Set + End Property + + Private Shared _lastSqlUpdate As Date + Public Shared Property LastSqlUpdate() As Date + Get + Return _lastSqlUpdate + End Get + Set(ByVal value As Date) + _lastSqlUpdate = value + End Set + End Property + + Private Shared _lastSelected As String + Public Shared Property LastSelected() As String + Get + Return _lastSelected + End Get + Set(ByVal value As String) + _lastSelected = value + End Set + End Property + + Private Shared _defaultConnection As mRemoteNG.Connection.Info + Public Shared Property DefaultConnection() As Connection.Info + Get + Return _defaultConnection + End Get + Set(ByVal value As Connection.Info) + _defaultConnection = value + End Set + End Property + + Private Shared _defaultInheritance As mRemoteNG.Connection.Info.Inheritance + Public Shared Property DefaultInheritance() As Connection.Info.Inheritance + Get + Return _defaultInheritance + End Get + Set(ByVal value As Connection.Info.Inheritance) + _defaultInheritance = value + End Set + End Property + + Private Shared _externalTools As New ArrayList() + Public Shared Property ExternalTools() As ArrayList + Get + Return _externalTools + End Get + Set(ByVal value As ArrayList) + _externalTools = value + End Set + End Property + #End Region +#Region "Classes" Public Class Windows Public Shared treeForm As UI.Window.Tree Public Shared treePanel As New DockContent @@ -143,7 +340,7 @@ Namespace App Windows.AnnouncementForm.Show(frmMain.pnlDock) End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Show (App.Runtime.Windows) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Show (App.Runtime.Windows) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -248,29 +445,29 @@ Namespace App Public Shared Sub CreateLogger() log4net.Config.XmlConfigurator.Configure(New FileInfo("mRemoteNG.exe.config")) - log = log4net.LogManager.GetLogger("mRemoteNG.Log") - log.InfoFormat("{0} started.", My.Application.Info.ProductName) - log.InfoFormat("Command Line: {0}", Environment.GetCommandLineArgs) + Log = log4net.LogManager.GetLogger("mRemoteNG.Log") + Log.InfoFormat("{0} started.", My.Application.Info.ProductName) + Log.InfoFormat("Command Line: {0}", Environment.GetCommandLineArgs) Try Dim servicePack As Integer For Each managementObject As ManagementObject In New ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem").Get() servicePack = managementObject.GetPropertyValue("ServicePackMajorVersion") If servicePack = 0 Then - log.InfoFormat("{0} {1}", managementObject.GetPropertyValue("Caption").Trim, managementObject.GetPropertyValue("OSArchitecture")) + Log.InfoFormat("{0} {1}", managementObject.GetPropertyValue("Caption").Trim, managementObject.GetPropertyValue("OSArchitecture")) Else - log.InfoFormat("{0} Service Pack {1} {2}", managementObject.GetPropertyValue("Caption").Trim, servicePack.ToString, managementObject.GetPropertyValue("OSArchitecture")) + Log.InfoFormat("{0} Service Pack {1} {2}", managementObject.GetPropertyValue("Caption").Trim, servicePack.ToString, managementObject.GetPropertyValue("OSArchitecture")) End If Next Catch ex As Exception - log.WarnFormat("Error retrieving operating system information from WMI. {0}", ex.Message) + Log.WarnFormat("Error retrieving operating system information from WMI. {0}", ex.Message) End Try - log.InfoFormat("Microsoft .NET Framework {0}", System.Environment.Version.ToString) + Log.InfoFormat("Microsoft .NET Framework {0}", System.Environment.Version.ToString) #If Not PORTABLE Then - log.InfoFormat("{0} {1}", My.Application.Info.ProductName.ToString, My.Application.Info.Version.ToString) + Log.InfoFormat("{0} {1}", My.Application.Info.ProductName.ToString, My.Application.Info.Version.ToString) #Else log.InfoFormat("{0} {1} {2}", My.Application.Info.ProductName.ToString, My.Application.Info.Version.ToString, My.Resources.strLabelPortableEdition) #End If - log.InfoFormat("System Culture: {0}/{1}", Threading.Thread.CurrentThread.CurrentUICulture.Name, Threading.Thread.CurrentThread.CurrentUICulture.NativeName) + Log.InfoFormat("System Culture: {0}/{1}", Threading.Thread.CurrentThread.CurrentUICulture.Name, Threading.Thread.CurrentThread.CurrentUICulture.NativeName) End Sub Public Shared Sub UpdateCheck() @@ -391,25 +588,25 @@ Namespace App My.Settings.ResetToolbars = True End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strCommandLineArgsCouldNotBeParsed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strCommandLineArgsCouldNotBeParsed & vbNewLine & ex.Message) End Try End Sub Public Shared Sub CreateSQLUpdateHandlerAndStartTimer() If My.Settings.UseSQLServer = True Then AddHandler Tools.Misc.SQLUpdateCheckFinished, AddressOf SQLUpdateCheckFinished - tmrSqlWatcher = New Timers.Timer(3000) - tmrSqlWatcher.Start() + TimerSqlWatcher = New Timers.Timer(3000) + TimerSqlWatcher.Start() End If End Sub Public Shared Sub DestroySQLUpdateHandlerAndStopTimer() Try - LastSQLUpdate = Nothing + LastSqlUpdate = Nothing RemoveHandler Tools.Misc.SQLUpdateCheckFinished, AddressOf SQLUpdateCheckFinished - If tmrSqlWatcher IsNot Nothing Then - tmrSqlWatcher.Stop() - tmrSqlWatcher.Close() + If TimerSqlWatcher IsNot Nothing Then + TimerSqlWatcher.Stop() + TimerSqlWatcher.Close() End If Catch ex As Exception End Try @@ -423,9 +620,9 @@ Namespace App Public Shared Sub BeforeQuit() Try - If App.Runtime.SysTrayIcon IsNot Nothing Then - If App.Runtime.SysTrayIcon.Disposed = False Then - App.Runtime.SysTrayIcon.Dispose() + If App.Runtime.NotificationAreaIcon IsNot Nothing Then + If App.Runtime.NotificationAreaIcon.Disposed = False Then + App.Runtime.NotificationAreaIcon.Dispose() End If End If @@ -433,12 +630,14 @@ Namespace App SaveConnections() End If - sS.Save() + Dim SettingsSave As New Config.Settings.Save() + SettingsSave.Save() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSettingsCouldNotBeSavedOrTrayDispose & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSettingsCouldNotBeSavedOrTrayDispose & vbNewLine & ex.Message, True) End Try End Sub End Class +#End Region #Region "Default Connection" Public Shared Function DefaultConnectionFromSettings() As mRemoteNG.Connection.Info @@ -604,12 +803,12 @@ Namespace App If NoTabber Then TryCast(cForm, UI.Window.Connection).TabController.Dispose() Else - wL.Add(cForm) + WindowList.Add(cForm) End If Return cForm Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't add panel" & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't add panel" & vbNewLine & ex.Message) Return Nothing End Try End Function @@ -625,7 +824,7 @@ Namespace App conW.SetFormText(nTitle.Replace("&", "&&")) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't rename panel" & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't rename panel" & vbNewLine & ex.Message) End Try End Sub @@ -645,7 +844,7 @@ Namespace App cMenScreens.DropDownItems.Add(cMenScreen) Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't enumerate screens" & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't enumerate screens" & vbNewLine & ex.Message) End Try End Sub @@ -668,8 +867,8 @@ Namespace App #Region "Connections Loading/Saving" Public Shared Sub NewConnections(ByVal filename As String) Try - connectionList = New Connection.List - containerList = New Container.List + ConnectionList = New Connection.List + ContainerList = New Container.List Dim conL As New Config.Connections.Load @@ -690,8 +889,8 @@ Namespace App xW.Close() - conL.ConnectionList = connectionList - conL.ContainerList = containerList + conL.ConnectionList = ConnectionList + conL.ContainerList = ContainerList conL.Import = False Tree.Node.ResetTree() @@ -702,43 +901,43 @@ Namespace App conL.ConnectionFileName = filename conL.Load() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strCouldNotCreateNewConnectionsFile & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strCouldNotCreateNewConnectionsFile & vbNewLine & ex.Message) End Try End Sub Private Shared Sub LoadConnectionsBG(Optional ByVal WithDialog As Boolean = False, Optional ByVal Update As Boolean = False) - _WithDialog = False - _LoadUpdate = True + _withDialog = False + _loadUpdate = True Dim t As New Thread(AddressOf LoadConnectionsBGd) t.SetApartmentState(Threading.ApartmentState.STA) t.Start() End Sub - Private Shared _WithDialog As Boolean = False - Private Shared _LoadUpdate As Boolean = False + Private Shared _withDialog As Boolean = False + Private Shared _loadUpdate As Boolean = False Private Shared Sub LoadConnectionsBGd() - LoadConnections(_WithDialog, _LoadUpdate) + LoadConnections(_withDialog, _loadUpdate) End Sub Public Shared Sub LoadConnections(Optional ByVal WithDialog As Boolean = False, Optional ByVal Update As Boolean = False) Try Dim tmrWasEnabled As Boolean - If tmrSqlWatcher IsNot Nothing Then - tmrWasEnabled = tmrSqlWatcher.Enabled + If TimerSqlWatcher IsNot Nothing Then + tmrWasEnabled = TimerSqlWatcher.Enabled - If tmrSqlWatcher.Enabled = True Then - tmrSqlWatcher.Stop() + If TimerSqlWatcher.Enabled = True Then + TimerSqlWatcher.Stop() End If End If - If connectionList IsNot Nothing And containerList IsNot Nothing Then - prevCL = connectionList.Copy - prevCTL = containerList.Copy + If ConnectionList IsNot Nothing And ContainerList IsNot Nothing Then + PreviousConnectionList = ConnectionList.Copy + PreviousContainerList = ContainerList.Copy End If - connectionList = New Connection.List - containerList = New Container.List + ConnectionList = New Connection.List + ContainerList = New Container.List Dim conL As New Config.Connections.Load @@ -776,9 +975,9 @@ Namespace App If File.Exists(conL.ConnectionFileName) = False Then If WithDialog Then - mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strConnectionsFileCouldNotBeLoaded, conL.ConnectionFileName)) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strConnectionsFileCouldNotBeLoaded, conL.ConnectionFileName)) Else - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strConnectionsFileCouldNotBeLoadedNew, conL.ConnectionFileName)) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strConnectionsFileCouldNotBeLoadedNew, conL.ConnectionFileName)) App.Runtime.NewConnections(conL.ConnectionFileName) End If @@ -788,16 +987,16 @@ Namespace App Try File.Copy(conL.ConnectionFileName, conL.ConnectionFileName & "_BAK", True) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strConnectionsFileBackupFailed & vbNewLine & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strConnectionsFileBackupFailed & vbNewLine & vbNewLine & ex.Message) End Try End If - conL.ConnectionList = connectionList - conL.ContainerList = containerList + conL.ConnectionList = ConnectionList + conL.ContainerList = ContainerList - If prevCL IsNot Nothing And prevCTL IsNot Nothing Then - conL.PreviousConnectionList = prevCL - conL.PreviousContainerList = prevCTL + If PreviousConnectionList IsNot Nothing And PreviousContainerList IsNot Nothing Then + conL.PreviousConnectionList = PreviousConnectionList + conL.PreviousContainerList = PreviousContainerList End If If Update = True Then @@ -820,14 +1019,14 @@ Namespace App conL.Load() If My.Settings.UseSQLServer = True Then - LastSQLUpdate = Now + LastSqlUpdate = Now End If - If tmrWasEnabled And tmrSqlWatcher IsNot Nothing Then - tmrSqlWatcher.Start() + If tmrWasEnabled And TimerSqlWatcher IsNot Nothing Then + TimerSqlWatcher.Start() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeLoaded & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeLoaded & vbNewLine & ex.Message) End Try End Sub @@ -853,14 +1052,14 @@ Namespace App End If nNode.Tag = nContI - containerList.Add(nContI) + ContainerList.Add(nContI) Dim conL As New Config.Connections.Load conL.ConnectionFileName = lD.FileNames(i) conL.RootTreeNode = nNode conL.Import = True - conL.ConnectionList = App.Runtime.connectionList - conL.ContainerList = App.Runtime.containerList + conL.ConnectionList = App.Runtime.ConnectionList + conL.ContainerList = App.Runtime.ContainerList conL.Load() @@ -868,7 +1067,7 @@ Namespace App Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeImported & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeImported & vbNewLine & ex.Message) End Try End Sub @@ -997,11 +1196,11 @@ Namespace App nConI.Parent = nNode.Parent.Tag End If - connectionList.Add(nConI) + ConnectionList.Add(nConI) Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpFileCouldNotBeImported & vbNewLine & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpFileCouldNotBeImported & vbNewLine & vbNewLine & ex.Message) End Try End Sub @@ -1069,7 +1268,7 @@ Namespace App nConI.Parent = nNode.Parent.Tag End If - connectionList.Add(nConI) + ConnectionList.Add(nConI) End If Next End Sub @@ -1079,19 +1278,19 @@ Namespace App End Sub Public Shared Sub SaveConnectionsBG() - _SaveUpdate = True + _saveUpdate = True Dim t As New Thread(AddressOf SaveConnectionsBGd) t.SetApartmentState(Threading.ApartmentState.STA) t.Start() End Sub - Private Shared _SaveUpdate As Boolean = False - Private Shared _SaveLock As Object = New Object + Private Shared _saveUpdate As Boolean = False + Private Shared _saveLock As Object = New Object Private Shared Sub SaveConnectionsBGd() - Monitor.Enter(_SaveLock) - SaveConnections(_SaveUpdate) - Monitor.Exit(_SaveLock) + Monitor.Enter(_saveLock) + SaveConnections(_saveUpdate) + Monitor.Exit(_saveLock) End Sub Public Shared Sub SaveConnections(Optional ByVal Update As Boolean = False) @@ -1102,10 +1301,10 @@ Namespace App Dim tmrWasEnabled As Boolean - If tmrSqlWatcher IsNot Nothing Then - tmrWasEnabled = tmrSqlWatcher.Enabled - If tmrSqlWatcher.Enabled = True Then - tmrSqlWatcher.Stop() + If TimerSqlWatcher IsNot Nothing Then + tmrWasEnabled = TimerSqlWatcher.Enabled + If TimerSqlWatcher.Enabled = True Then + TimerSqlWatcher.Stop() End If End If @@ -1119,8 +1318,8 @@ Namespace App End If End If - conS.ConnectionList = connectionList - conS.ContainerList = containerList + conS.ConnectionList = ConnectionList + conS.ContainerList = ContainerList conS.Export = False conS.SaveSecurity = New Security.Save(False) conS.RootTreeNode = Windows.treeForm.tvConnections.Nodes(0) @@ -1136,14 +1335,14 @@ Namespace App conS.Save() If My.Settings.UseSQLServer = True Then - LastSQLUpdate = Now + LastSqlUpdate = Now End If If tmrWasEnabled Then - tmrSqlWatcher.Start() + TimerSqlWatcher.Start() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeSaved & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeSaved & vbNewLine & ex.Message) End Try End Sub @@ -1152,10 +1351,10 @@ Namespace App Try Dim tmrWasEnabled As Boolean - If tmrSqlWatcher IsNot Nothing Then - tmrWasEnabled = tmrSqlWatcher.Enabled - If tmrSqlWatcher.Enabled = True Then - tmrSqlWatcher.Stop() + If TimerSqlWatcher IsNot Nothing Then + tmrWasEnabled = TimerSqlWatcher.Enabled + If TimerSqlWatcher.Enabled = True Then + TimerSqlWatcher.Stop() End If End If @@ -1189,8 +1388,8 @@ Namespace App End If End If - conS.ConnectionList = connectionList - conS.ContainerList = containerList + conS.ConnectionList = ConnectionList + conS.ContainerList = ContainerList If RootNode IsNot Windows.treeForm.tvConnections.Nodes(0) Then conS.Export = True End If @@ -1199,43 +1398,40 @@ Namespace App conS.Save() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strConnectionsFileCouldNotSaveAs, conS.ConnectionFileName) & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strConnectionsFileCouldNotSaveAs, conS.ConnectionFileName) & vbNewLine & ex.Message) End Try End Sub #End Region #Region "Opening Connection" - Private Shared nProt As Connection.Protocol.Base - Private Shared nCi As Connection.Info - Public Shared Function CreateQuicky(ByVal ConString As String, Optional ByVal Protocol As Connection.Protocol.Protocols = Connection.Protocol.Protocols.NONE) As Connection.Info Try Dim Uri As System.Uri = New System.Uri("dummyscheme" + System.Uri.SchemeDelimiter + ConString) If Not String.IsNullOrEmpty(Uri.Host) Then - nCi = New Connection.Info + Dim newConnectionInfo As New Connection.Info - nCi.Name = String.Format(My.Resources.strQuick, Uri.Host) - nCi.Protocol = Protocol - nCi.Hostname = Uri.Host + newConnectionInfo.Name = String.Format(My.Resources.strQuick, Uri.Host) + newConnectionInfo.Protocol = Protocol + newConnectionInfo.Hostname = Uri.Host If Uri.Port = -1 Then - nCi.Port = Nothing + newConnectionInfo.Port = Nothing Else - nCi.Port = Uri.Port + newConnectionInfo.Port = Uri.Port End If - nCi.IsQuicky = True + newConnectionInfo.IsQuicky = True - Windows.quickyForm.ConnectionInfo = nCi + Windows.quickyForm.ConnectionInfo = newConnectionInfo If Protocol = Connection.Protocol.Protocols.NONE Then Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide) End If - Return nCi + Return newConnectionInfo End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectFailed & vbNewLine & ex.Message) End Try Return Nothing @@ -1245,7 +1441,7 @@ Namespace App Try OpenConnection(Connection.Info.Force.None) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) End Try End Sub @@ -1267,7 +1463,7 @@ Namespace App Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) End Try End Sub @@ -1275,7 +1471,7 @@ Namespace App Try OpenConnection(ConnectionInfo, Connection.Info.Force.None) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) End Try End Sub @@ -1283,7 +1479,7 @@ Namespace App Try OpenConnectionFinal(ConnectionInfo, Connection.Info.Force.None, ConnectionForm) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) End Try End Sub @@ -1291,7 +1487,7 @@ Namespace App Try OpenConnectionFinal(ConnectionInfo, Force, ConnectionForm) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) End Try End Sub @@ -1299,57 +1495,58 @@ Namespace App Try OpenConnectionFinal(ConnectionInfo, Force, Nothing) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) End Try End Sub - Private Shared Sub OpenConnectionFinal(ByVal nCi As mRemoteNG.Connection.Info, ByVal Force As mRemoteNG.Connection.Info.Force, ByVal ConForm As Form) + Private Shared Sub OpenConnectionFinal(ByVal newConnectionInfo 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) + If newConnectionInfo.Hostname = "" And newConnectionInfo.Protocol <> Connection.Protocol.Protocols.IntApp Then + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strConnectionOpenFailedNoHostname) Exit Sub End If - If nCi.PreExtApp <> "" Then - Dim extA As Tools.ExternalApp = App.Runtime.GetExtAppByName(nCi.PreExtApp) + If newConnectionInfo.PreExtApp <> "" Then + Dim extA As Tools.ExternalApp = App.Runtime.GetExtAppByName(newConnectionInfo.PreExtApp) If extA IsNot Nothing Then - extA.Start(nCi) + extA.Start(newConnectionInfo) End If End If If (Force And Connection.Info.Force.DoNotJump) <> Connection.Info.Force.DoNotJump Then - If SwitchToOpenConnection(nCi) Then + If SwitchToOpenConnection(newConnectionInfo) Then Exit Sub End If End If + Dim newProtocol As New Connection.Protocol.Base ' Create connection based on protocol type - Select Case nCi.Protocol + Select Case newConnectionInfo.Protocol Case Connection.Protocol.Protocols.RDP - nProt = New Connection.Protocol.RDP + newProtocol = New Connection.Protocol.RDP Case Connection.Protocol.Protocols.VNC - nProt = New Connection.Protocol.VNC + newProtocol = New Connection.Protocol.VNC Case Connection.Protocol.Protocols.SSH1 - nProt = New Connection.Protocol.SSH1 + newProtocol = New Connection.Protocol.SSH1 Case Connection.Protocol.Protocols.SSH2 - nProt = New Connection.Protocol.SSH2 + newProtocol = New Connection.Protocol.SSH2 Case Connection.Protocol.Protocols.Telnet - nProt = New Connection.Protocol.Telnet + newProtocol = New Connection.Protocol.Telnet Case Connection.Protocol.Protocols.Rlogin - nProt = New Connection.Protocol.Rlogin + newProtocol = New Connection.Protocol.Rlogin Case Connection.Protocol.Protocols.RAW - nProt = New Connection.Protocol.RAW + newProtocol = New Connection.Protocol.RAW Case Connection.Protocol.Protocols.HTTP - nProt = New Connection.Protocol.HTTP(nCi.RenderingEngine) + newProtocol = New Connection.Protocol.HTTP(newConnectionInfo.RenderingEngine) Case Connection.Protocol.Protocols.HTTPS - nProt = New Connection.Protocol.HTTPS(nCi.RenderingEngine) + newProtocol = New Connection.Protocol.HTTPS(newConnectionInfo.RenderingEngine) Case Connection.Protocol.Protocols.ICA - nProt = New Connection.Protocol.ICA + newProtocol = New Connection.Protocol.ICA Case Connection.Protocol.Protocols.IntApp - nProt = New Connection.Protocol.IntApp + newProtocol = New Connection.Protocol.IntApp - If nCi.ExtApp = "" Then + If newConnectionInfo.ExtApp = "" Then Throw New Exception(My.Resources.strNoExtAppDefined) End If Case Else @@ -1360,7 +1557,7 @@ Namespace App Dim cForm As Form Dim cPnl As String - If nCi.Panel = "" Or (Force And Connection.Info.Force.OverridePanel) = Connection.Info.Force.OverridePanel Or My.Settings.AlwaysShowPanelSelectionDlg Then + If newConnectionInfo.Panel = "" Or (Force And Connection.Info.Force.OverridePanel) = Connection.Info.Force.OverridePanel Or My.Settings.AlwaysShowPanelSelectionDlg Then Dim frmPnl As New frmChoosePanel If frmPnl.ShowDialog = DialogResult.OK Then cPnl = frmPnl.Panel @@ -1368,11 +1565,11 @@ Namespace App Exit Sub End If Else - cPnl = nCi.Panel + cPnl = newConnectionInfo.Panel End If If ConForm Is Nothing Then - cForm = wL.FromString(cPnl) + cForm = WindowList.FromString(cPnl) Else cForm = ConForm End If @@ -1385,53 +1582,53 @@ Namespace App TryCast(cForm, UI.Window.Connection).Focus() End If - cContainer = TryCast(cForm, UI.Window.Connection).AddConnectionTab(nCi) + cContainer = TryCast(cForm, UI.Window.Connection).AddConnectionTab(newConnectionInfo) - If nCi.Protocol = Connection.Protocol.Protocols.IntApp Then - If App.Runtime.GetExtAppByName(nCi.ExtApp).Icon IsNot Nothing Then - TryCast(cContainer, Magic.Controls.TabPage).Icon = App.Runtime.GetExtAppByName(nCi.ExtApp).Icon + If newConnectionInfo.Protocol = Connection.Protocol.Protocols.IntApp Then + If App.Runtime.GetExtAppByName(newConnectionInfo.ExtApp).Icon IsNot Nothing Then + TryCast(cContainer, Magic.Controls.TabPage).Icon = App.Runtime.GetExtAppByName(newConnectionInfo.ExtApp).Icon End If End If - AddHandler nProt.Closed, AddressOf TryCast(cForm, UI.Window.Connection).Prot_Event_Closed + AddHandler newProtocol.Closed, AddressOf TryCast(cForm, UI.Window.Connection).Prot_Event_Closed - AddHandler nProt.Disconnected, AddressOf Prot_Event_Disconnected - AddHandler nProt.Connected, AddressOf Prot_Event_Connected - AddHandler nProt.Closed, AddressOf Prot_Event_Closed - AddHandler nProt.ErrorOccured, AddressOf Prot_Event_ErrorOccured + AddHandler newProtocol.Disconnected, AddressOf Prot_Event_Disconnected + AddHandler newProtocol.Connected, AddressOf Prot_Event_Connected + AddHandler newProtocol.Closed, AddressOf Prot_Event_Closed + AddHandler newProtocol.ErrorOccured, AddressOf Prot_Event_ErrorOccured - nProt.InterfaceControl = New Connection.InterfaceControl(cContainer, nProt, nCi) + newProtocol.InterfaceControl = New Connection.InterfaceControl(cContainer, newProtocol, newConnectionInfo) - nProt.Force = Force + newProtocol.Force = Force - If nProt.SetProps() = False Then - nProt.Close() + If newProtocol.SetProps() = False Then + newProtocol.Close() Exit Sub End If - If nProt.Connect() = False Then - nProt.Close() + If newProtocol.Connect() = False Then + newProtocol.Close() Exit Sub End If - nCi.OpenConnections.Add(nProt) + newConnectionInfo.OpenConnections.Add(newProtocol) - If nCi.IsQuicky = False Then - If nCi.Protocol <> Connection.Protocol.Protocols.IntApp Then - Tree.Node.SetNodeImage(nCi.TreeNode, Images.Enums.TreeImage.ConnectionOpen) + If newConnectionInfo.IsQuicky = False Then + If newConnectionInfo.Protocol <> Connection.Protocol.Protocols.IntApp Then + Tree.Node.SetNodeImage(newConnectionInfo.TreeNode, Images.Enums.TreeImage.ConnectionOpen) Else - Dim extApp As Tools.ExternalApp = GetExtAppByName(nCi.ExtApp) + Dim extApp As Tools.ExternalApp = GetExtAppByName(newConnectionInfo.ExtApp) If extApp IsNot Nothing Then If extApp.TryIntegrate Then - If nCi.TreeNode IsNot Nothing Then - Tree.Node.SetNodeImage(nCi.TreeNode, Images.Enums.TreeImage.ConnectionOpen) + If newConnectionInfo.TreeNode IsNot Nothing Then + Tree.Node.SetNodeImage(newConnectionInfo.TreeNode, Images.Enums.TreeImage.ConnectionOpen) End If End If End If End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message) End Try End Sub @@ -1453,7 +1650,7 @@ Namespace App #Region "Event Handlers" Public Shared Sub Prot_Event_Disconnected(ByVal sender As Object, ByVal DisconnectedMessage As String) Try - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strProtocolEventDisconnected, DisconnectedMessage), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strProtocolEventDisconnected, DisconnectedMessage), True) Dim Prot As Connection.Protocol.Base = sender If Prot.InterfaceControl.Info.Protocol = Connection.Protocol.Protocols.RDP Then @@ -1462,14 +1659,14 @@ Namespace App Dim ReasonDescription As String = Reason(1) If ReasonCode > 3 Then If ReasonDescription <> "" Then - mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strRdpDisconnected & vbNewLine & ReasonDescription & vbNewLine & String.Format(My.Resources.strErrorCode, ReasonCode)) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strRdpDisconnected & vbNewLine & ReasonDescription & vbNewLine & String.Format(My.Resources.strErrorCode, ReasonCode)) Else - mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strRdpDisconnected & vbNewLine & String.Format(My.Resources.strErrorCode, ReasonCode)) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strRdpDisconnected & vbNewLine & String.Format(My.Resources.strErrorCode, ReasonCode)) End If End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strProtocolEventDisconnectFailed, ex.Message), True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strProtocolEventDisconnectFailed, ex.Message), True) End Try End Sub @@ -1477,9 +1674,9 @@ Namespace App Try Dim Prot As Connection.Protocol.Base = sender - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnenctionCloseEvent, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnenctionCloseEvent, True) - mC.AddMessage(Messages.MessageClass.ReportMsg, String.Format(My.Resources.strConnenctionClosedByUser, Prot.InterfaceControl.Info.Hostname, Prot.InterfaceControl.Info.Protocol.ToString, My.User.Name)) + MessageCollector.AddMessage(Messages.MessageClass.ReportMsg, String.Format(My.Resources.strConnenctionClosedByUser, Prot.InterfaceControl.Info.Hostname, Prot.InterfaceControl.Info.Protocol.ToString, My.User.Name)) Prot.InterfaceControl.Info.OpenConnections.Remove(Prot) @@ -1494,30 +1691,30 @@ Namespace App End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnenctionCloseEventFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnenctionCloseEventFailed & vbNewLine & ex.Message, True) End Try End Sub Public Shared Sub Prot_Event_Connected(ByVal sender As Object) Dim prot As mRemoteNG.Connection.Protocol.Base = sender - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnectionEventConnected, True) - mC.AddMessage(Messages.MessageClass.ReportMsg, String.Format(My.Resources.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol.ToString, My.User.Name, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField)) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnectionEventConnected, True) + MessageCollector.AddMessage(Messages.MessageClass.ReportMsg, String.Format(My.Resources.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol.ToString, My.User.Name, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField)) End Sub Public Shared Sub Prot_Event_ErrorOccured(ByVal sender As Object, ByVal ErrorMessage As String) Try - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnectionEventErrorOccured, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnectionEventErrorOccured, True) Dim Prot As Connection.Protocol.Base = sender If Prot.InterfaceControl.Info.Protocol = Connection.Protocol.Protocols.RDP Then If ErrorMessage > -1 Then - mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strConnectionRdpErrorDetail, ErrorMessage, Connection.Protocol.RDP.FatalErrors.GetError(ErrorMessage))) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strConnectionRdpErrorDetail, ErrorMessage, Connection.Protocol.RDP.FatalErrors.GetError(ErrorMessage))) End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionEventConnectionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionEventConnectionFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -1525,11 +1722,11 @@ Namespace App #Region "External Apps" Public Shared Sub GetExtApps() Array.Clear(Tools.ExternalAppsTypeConverter.ExternalApps, 0, Tools.ExternalAppsTypeConverter.ExternalApps.Length) - Array.Resize(Tools.ExternalAppsTypeConverter.ExternalApps, ExtApps.Count + 1) + Array.Resize(Tools.ExternalAppsTypeConverter.ExternalApps, ExternalTools.Count + 1) Dim i As Integer = 0 - For Each extA As Tools.ExternalApp In ExtApps + For Each extA As Tools.ExternalApp In ExternalTools Tools.ExternalAppsTypeConverter.ExternalApps(i) = extA.DisplayName i += 1 @@ -1539,7 +1736,7 @@ Namespace App End Sub Public Shared Function GetExtAppByName(ByVal Name As String) As Tools.ExternalApp - For Each extA As Tools.ExternalApp In ExtApps + For Each extA As Tools.ExternalApp In ExternalTools If extA.DisplayName = Name Then Return extA End If @@ -1588,7 +1785,7 @@ Namespace App sWr.WriteLine(Text) sWr.Close() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLogWriteToFileFailed) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLogWriteToFileFailed) End Try End Sub @@ -1604,7 +1801,7 @@ Namespace App Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLogWriteToFileFinalLocationFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLogWriteToFileFinalLocationFailed & vbNewLine & ex.Message, True) Return False End Try End Function @@ -1613,7 +1810,7 @@ Namespace App Try Dim txt As String = My.Application.Info.ProductName - If ConnectionFileName <> "" And ConnectionsFileLoaded = True Then + If ConnectionFileName <> "" And IsConnectionsFileLoaded = True Then If My.Settings.ShowCompleteConsPathInTitle Then txt &= " - " & ConnectionFileName Else @@ -1623,7 +1820,7 @@ Namespace App ChangeMainFormText(txt) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSettingMainFormTextFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSettingMainFormTextFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -1639,9 +1836,9 @@ Namespace App Public Shared Function FindConnectionContainer(ByVal ConI As Connection.Info) As Connection.InterfaceControl If ConI.OpenConnections.Count > 0 Then - For i As Integer = 0 To wL.Count - 1 - If TypeOf wL.Items(i) Is UI.Window.Connection Then - Dim conW As UI.Window.Connection = wL.Items(i) + For i As Integer = 0 To WindowList.Count - 1 + If TypeOf WindowList.Items(i) Is UI.Window.Connection Then + Dim conW As UI.Window.Connection = WindowList.Items(i) If conW.TabController IsNot Nothing Then For Each t As Magic.Controls.TabPage In conW.TabController.TabPages @@ -1675,13 +1872,13 @@ Namespace App #End Region #Region "SQL Watcher" - Private Shared Sub tmrSqlWatcher_Elapsed(ByVal sender As Object, ByVal e As System.Timers.ElapsedEventArgs) Handles tmrSqlWatcher.Elapsed + Private Shared Sub tmrSqlWatcher_Elapsed(ByVal sender As Object, ByVal e As System.Timers.ElapsedEventArgs) Handles _timerSqlWatcher.Elapsed Tools.Misc.IsSQLUpdateAvailableBG() End Sub Private Shared Sub SQLUpdateCheckFinished(ByVal UpdateAvailable As Boolean) If UpdateAvailable = True Then - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strSqlUpdateCheckUpdateAvailable, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strSqlUpdateCheckUpdateAvailable, True) LoadConnectionsBG() End If End Sub diff --git a/mRemoteV1/App/App.Update.vb b/mRemoteV1/App/App.Update.vb index a74f26cf..7cbce975 100644 --- a/mRemoteV1/App/App.Update.vb +++ b/mRemoteV1/App/App.Update.vb @@ -28,7 +28,7 @@ Namespace App Return uI.InfoOk Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "IsProxyOK (App.Update) failed" & vbNewLine & ex.Message, False) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsProxyOK (App.Update) failed" & vbNewLine & ex.Message, False) Return False End Try End Function @@ -47,7 +47,7 @@ Namespace App Return False End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "IsUpdateAvailable failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsUpdateAvailable failed" & vbNewLine & ex.Message, True) Return False End Try End Function @@ -97,7 +97,7 @@ Namespace App Dim strImgURLLink As String = strUpdate.Substring(strUpdate.IndexOf("imgURLLink: ") + 12, strUpdate.IndexOf(vbNewLine) - 12) uI.ImageURLLink = strImgURLLink Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Update Image Info could not be read." & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Update Image Info could not be read." & vbNewLine & ex.Message, True) End Try Catch ex As Exception uI.InfoOk = False @@ -109,7 +109,7 @@ Namespace App _curUI = uI Return uI Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting update info failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Getting update info failed" & vbNewLine & ex.Message, True) Return Nothing End Try End Function @@ -123,10 +123,10 @@ Namespace App _curUI.UpdateLocation = My.Computer.FileSystem.SpecialDirectories.Temp & "\mRemote_Update.exe" wCl.DownloadFileAsync(New Uri(dURL), _curUI.UpdateLocation) - + Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Update download failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Update download failed" & vbNewLine & ex.Message, True) Return False End Try End Function @@ -164,7 +164,7 @@ Namespace App Return strTemp Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "GetUpdateFile failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetUpdateFile failed" & vbNewLine & ex.Message, True) Return "" End Try End Function @@ -184,7 +184,7 @@ Namespace App RaiseEvent DownloadCompleted(sender, e, False) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "DLCompleted failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "DLCompleted failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/ApplicationEvents.vb b/mRemoteV1/ApplicationEvents.vb index 18c2be76..277c59bd 100644 --- a/mRemoteV1/ApplicationEvents.vb +++ b/mRemoteV1/ApplicationEvents.vb @@ -63,6 +63,5 @@ End If End Sub End Class - End Namespace diff --git a/mRemoteV1/Config/Config.Connections.Load.vb b/mRemoteV1/Config/Config.Connections.Load.vb index 0f7c4081..c6812efc 100644 --- a/mRemoteV1/Config/Config.Connections.Load.vb +++ b/mRemoteV1/Config/Config.Connections.Load.vb @@ -182,7 +182,7 @@ Namespace Config #Region "SQL" Private Sub LoadFromSQL() Try - App.Runtime.ConnectionsFileLoaded = False + App.Runtime.IsConnectionsFileLoaded = False If _SQLUsername <> "" Then sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword) @@ -264,12 +264,12 @@ Namespace Config AddNodeToTree(rootNode) SetSelectedNode(selNode) - App.Runtime.ConnectionsFileLoaded = True + App.Runtime.IsConnectionsFileLoaded = True 'App.Runtime.Windows.treeForm.InitialRefresh() sqlCon.Close() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLoadFromSqlFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLoadFromSqlFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -415,7 +415,7 @@ Namespace Config 'AddNodesFromSQL(tNode) End While Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strAddNodesFromSqlFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strAddNodesFromSqlFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -567,7 +567,7 @@ Namespace Config Return conI Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strGetConnectionInfoFromSqlFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strGetConnectionInfoFromSqlFailed & vbNewLine & ex.Message, True) End Try Return Nothing @@ -624,7 +624,7 @@ Namespace Config Private Sub LoadFromXML(Optional ByVal cons As String = "") Try - App.Runtime.ConnectionsFileLoaded = False + App.Runtime.IsConnectionsFileLoaded = False ' SECTION 1. Create a DOM Document and load the XML data into it. Me.xDom = New XmlDocument() @@ -638,7 +638,7 @@ Namespace Config Dim enCulture As System.Globalization.CultureInfo = New CultureInfo("en-US") Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value, enCulture) Else - mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strOldConffile) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strOldConffile) End If ' SECTION 2. Initialize the treeview control. @@ -676,7 +676,7 @@ Namespace Config End If If Me._Import = True And imp = False Then - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strCannotImportNormalSessionFile) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strCannotImportNormalSessionFile) Exit Sub End If @@ -711,11 +711,11 @@ Namespace Config Me._RootTreeNode.EnsureVisible() - App.Runtime.ConnectionsFileLoaded = True + App.Runtime.IsConnectionsFileLoaded = True App.Runtime.Windows.treeForm.InitialRefresh() Catch ex As Exception - App.Runtime.ConnectionsFileLoaded = False - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLoadFromXmlFailed & vbNewLine & ex.Message, True) + App.Runtime.IsConnectionsFileLoaded = False + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLoadFromXmlFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -791,7 +791,7 @@ Namespace Config inTreeNode.Text = inXmlNode.Attributes("Name").Value.Trim End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strAddNodeFromXmlFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strAddNodeFromXmlFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -1027,7 +1027,7 @@ Namespace Config End If End With Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strGetConnectionInfoFromXmlFailed, conI.Name, Me.ConnectionFileName, ex.Message), False) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strGetConnectionInfoFromXmlFailed, conI.Name, Me.ConnectionFileName, ex.Message), False) End Try Return conI End Function diff --git a/mRemoteV1/Config/Config.Connections.Save.vb b/mRemoteV1/Config/Config.Connections.Save.vb index cbcc4bc8..4312368e 100644 --- a/mRemoteV1/Config/Config.Connections.Save.vb +++ b/mRemoteV1/Config/Config.Connections.Save.vb @@ -189,7 +189,7 @@ Namespace Config sqlDataReader.Close() If databaseVersion.CompareTo(New System.Version(2, 2)) = 0 Then ' 2.2 - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format("Upgrading database from version {0} to version {1}.", databaseVersion.ToString, "2.3")) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format("Upgrading database from version {0} to version {1}.", databaseVersion.ToString, "2.3")) sqlCommand = New SqlCommand("ALTER TABLE tblCons ADD EnableFontSmoothing bit NOT NULL DEFAULT 0, EnableDesktopComposition bit NOT NULL DEFAULT 0, InheritEnableFontSmoothing bit NOT NULL DEFAULT 0, InheritEnableDesktopComposition bit NOT NULL DEFAULT 0;", sqlConnection) sqlCommand.ExecuteNonQuery() databaseVersion = New System.Version(2, 3) @@ -200,10 +200,10 @@ Namespace Config End If If isVerified = False Then - mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(strErrorBadDatabaseVersion, databaseVersion.ToString, My.Application.Info.ProductName)) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, String.Format(strErrorBadDatabaseVersion, databaseVersion.ToString, My.Application.Info.ProductName)) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(strErrorVerifyDatabaseVersionFailed, ex.Message)) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(strErrorVerifyDatabaseVersionFailed, ex.Message)) Finally If sqlDataReader IsNot Nothing Then If Not sqlDataReader.IsClosed Then sqlDataReader.Close() @@ -222,7 +222,7 @@ Namespace Config sqlCon.Open() If Not VerifyDatabaseVersion(sqlCon) Then - mC.AddMessage(Messages.MessageClass.ErrorMsg, strErrorConnectionListSaveFailed) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, strErrorConnectionListSaveFailed) Return End If @@ -558,7 +558,7 @@ Namespace Config Private Sub SaveToXML() Try - If App.Runtime.ConnectionsFileLoaded = False Then + If App.Runtime.IsConnectionsFileLoaded = False Then Exit Sub End If @@ -606,7 +606,7 @@ Namespace Config xW.WriteEndElement() xW.Close() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveToXML failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveToXML failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -636,7 +636,7 @@ Namespace Config End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "saveNode failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "saveNode failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -854,7 +854,7 @@ Namespace Config xW.WriteAttributeString("InheritRDGatewayDomain", "", False) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveConnectionFields failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveConnectionFields failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -863,7 +863,7 @@ Namespace Config Private csvWr As StreamWriter Private Sub SaveTomRCSV() - If App.Runtime.ConnectionsFileLoaded = False Then + If App.Runtime.IsConnectionsFileLoaded = False Then Exit Sub End If @@ -958,7 +958,7 @@ Namespace Config #Region "vRD CSV" Private Sub SaveTovRDCSV() - If App.Runtime.ConnectionsFileLoaded = False Then + If App.Runtime.IsConnectionsFileLoaded = False Then Exit Sub End If @@ -1008,7 +1008,7 @@ Namespace Config #Region "vRD VRE" Private Sub SaveToVRE() - If App.Runtime.ConnectionsFileLoaded = False Then + If App.Runtime.IsConnectionsFileLoaded = False Then Exit Sub End If diff --git a/mRemoteV1/Config/Config.Settings.Load.vb b/mRemoteV1/Config/Config.Settings.Load.vb index 75dbaf3e..fd148942 100644 --- a/mRemoteV1/Config/Config.Settings.Load.vb +++ b/mRemoteV1/Config/Config.Settings.Load.vb @@ -88,7 +88,7 @@ Namespace Config End If If My.Settings.ShowSystemTrayIcon Then - App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon() + App.Runtime.NotificationAreaIcon = New Tools.Controls.NotificationAreaIcon() End If If My.Settings.AutoSaveEveryMinutes > 0 Then @@ -223,7 +223,7 @@ Namespace Config extA.TryIntegrate = xEl.Attributes("TryToIntegrate").Value End If - ExtApps.Add(extA) + ExternalTools.Add(extA) Next MainForm.SwitchToolbarText(My.Settings.ExtAppsTBShowText) diff --git a/mRemoteV1/Config/Config.Settings.Save.vb b/mRemoteV1/Config/Config.Settings.Save.vb index 8a5c0867..1252025e 100644 --- a/mRemoteV1/Config/Config.Settings.Save.vb +++ b/mRemoteV1/Config/Config.Settings.Save.vb @@ -5,27 +5,11 @@ Imports System.IO Namespace Config Namespace Settings Public Class Save -#Region "Public Properties" - Private _MainForm As frmMain - Public Property MainForm() As frmMain - Get - Return Me._MainForm - End Get - Set(ByVal value As frmMain) - Me._MainForm = value - End Set - End Property -#End Region - #Region "Public Methods" - Public Sub New(ByVal MainForm As frmMain) - Me._MainForm = MainForm - End Sub - Public Sub Save() Try - With Me._MainForm - Dim windowPlacement As New Tools.WindowPlacement(_MainForm) + With frmMain + Dim windowPlacement As New Tools.WindowPlacement(frmMain) If .WindowState = FormWindowState.Minimized And windowPlacement.RestoreToMaximized Then .Opacity = 0 .WindowState = FormWindowState.Maximized @@ -69,7 +53,7 @@ Namespace Config Me.SavePanelsToXML() Me.SaveExternalAppsToXML() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" & vbNewLine & vbNewLine & ex.Message, False) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" & vbNewLine & vbNewLine & ex.Message, False) End Try End Sub @@ -79,9 +63,9 @@ Namespace Config Directory.CreateDirectory(App.Info.Settings.SettingsPath) End If - MainForm.pnlDock.SaveAsXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName) + frmMain.pnlDock.SaveAsXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" & vbNewLine & vbNewLine & ex.Message, False) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" & vbNewLine & vbNewLine & ex.Message, False) End Try End Sub @@ -91,29 +75,29 @@ Namespace Config Directory.CreateDirectory(App.Info.Settings.SettingsPath) End If - Dim xW As New XmlTextWriter(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName, System.Text.Encoding.UTF8) - xW.Formatting = Formatting.Indented - xW.Indentation = 4 + Dim xmlTextWriter As New XmlTextWriter(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName, System.Text.Encoding.UTF8) + xmlTextWriter.Formatting = Formatting.Indented + xmlTextWriter.Indentation = 4 - xW.WriteStartDocument() - xW.WriteStartElement("Apps") + xmlTextWriter.WriteStartDocument() + xmlTextWriter.WriteStartElement("Apps") - For Each extA As Tools.ExternalApp In ExtApps - xW.WriteStartElement("App") - xW.WriteAttributeString("DisplayName", "", extA.DisplayName) - xW.WriteAttributeString("FileName", "", extA.FileName) - xW.WriteAttributeString("Arguments", "", extA.Arguments) - xW.WriteAttributeString("WaitForExit", "", extA.WaitForExit) - xW.WriteAttributeString("TryToIntegrate", "", extA.TryIntegrate) - xW.WriteEndElement() + For Each extA As Tools.ExternalApp In ExternalTools + xmlTextWriter.WriteStartElement("App") + xmlTextWriter.WriteAttributeString("DisplayName", "", extA.DisplayName) + xmlTextWriter.WriteAttributeString("FileName", "", extA.FileName) + xmlTextWriter.WriteAttributeString("Arguments", "", extA.Arguments) + xmlTextWriter.WriteAttributeString("WaitForExit", "", extA.WaitForExit) + xmlTextWriter.WriteAttributeString("TryToIntegrate", "", extA.TryIntegrate) + xmlTextWriter.WriteEndElement() Next - xW.WriteEndElement() - xW.WriteEndDocument() + xmlTextWriter.WriteEndElement() + xmlTextWriter.WriteEndDocument() - xW.Close() + xmlTextWriter.Close() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" & vbNewLine & vbNewLine & ex.Message, False) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" & vbNewLine & vbNewLine & ex.Message, False) End Try End Sub #End Region diff --git a/mRemoteV1/Connection/Connection.Icon.vb b/mRemoteV1/Connection/Connection.Icon.vb index 7e025f02..030af1e2 100644 --- a/mRemoteV1/Connection/Connection.Icon.vb +++ b/mRemoteV1/Connection/Connection.Icon.vb @@ -29,7 +29,7 @@ Namespace Connection Return nI End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get Icon from String" & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get Icon from String" & vbNewLine & ex.Message) End Try Return Nothing diff --git a/mRemoteV1/Connection/Connection.Info.vb b/mRemoteV1/Connection/Connection.Info.vb index a1ac2aaa..304de295 100644 --- a/mRemoteV1/Connection/Connection.Info.vb +++ b/mRemoteV1/Connection/Connection.Info.vb @@ -1499,7 +1499,7 @@ Namespace Connection Me._Port = Connection.Protocol.IntApp.Defaults.Port End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionSetDefaultPortFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionSetDefaultPortFailed & vbNewLine & ex.Message) End Try End Sub #End Region diff --git a/mRemoteV1/Connection/Connection.InterfaceControl.vb b/mRemoteV1/Connection/Connection.InterfaceControl.vb index 99fb5367..8d8e83ee 100644 --- a/mRemoteV1/Connection/Connection.InterfaceControl.vb +++ b/mRemoteV1/Connection/Connection.InterfaceControl.vb @@ -37,7 +37,7 @@ Namespace Connection Me.Anchor = AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right Or AnchorStyles.Top InitializeComponent() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new InterfaceControl" & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new InterfaceControl" & vbNewLine & ex.Message) End Try End Sub #End Region diff --git a/mRemoteV1/Connection/Connection.Protocol.Base.vb b/mRemoteV1/Connection/Connection.Protocol.Base.vb index 56aa8b5c..3be399a0 100644 --- a/mRemoteV1/Connection/Connection.Protocol.Base.vb +++ b/mRemoteV1/Connection/Connection.Protocol.Base.vb @@ -58,7 +58,7 @@ Namespace Connection Try Me._Control.Focus() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't focus Control (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't focus Control (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) End Try End Sub @@ -77,7 +77,7 @@ Namespace Connection Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) Return False End Try End Function @@ -113,7 +113,7 @@ Namespace Connection Try Me.DisposeControl() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Could not dispose control, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Could not dispose control, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) End Try End If @@ -127,11 +127,11 @@ Namespace Connection Me.DisposeInterface() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Could not set InterfaceControl.Parent.Tag or Dispose Interface, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Could not set InterfaceControl.Parent.Tag or Dispose Interface, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) End Try End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)" & vbNewLine & ex.Message, True) End Try End Sub diff --git a/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb b/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb index 1ac90c45..ca3b5bcc 100644 --- a/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb +++ b/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb @@ -26,7 +26,7 @@ Namespace Connection NewExtended() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectionFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -64,7 +64,7 @@ Namespace Connection Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpSetPropsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpSetPropsFailed & vbNewLine & ex.Message, True) Return False End Try End Function @@ -107,7 +107,7 @@ Namespace Connection MyBase.Connect() Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectFailed & vbNewLine & ex.Message, True) Return False End Try End Function @@ -163,7 +163,7 @@ Namespace Connection End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strHttpDocumentTileChangeFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strHttpDocumentTileChangeFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/Connection/Connection.Protocol.ICA.vb b/mRemoteV1/Connection/Connection.Protocol.ICA.vb index ffae12a9..21810476 100644 --- a/mRemoteV1/Connection/Connection.Protocol.ICA.vb +++ b/mRemoteV1/Connection/Connection.Protocol.ICA.vb @@ -18,7 +18,7 @@ Namespace Connection Try Me.Control = New AxICAClient Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaControlFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaControlFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -75,7 +75,7 @@ Namespace Connection Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetPropsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetPropsFailed & vbNewLine & ex.Message, True) Return False End Try End Function @@ -88,7 +88,7 @@ Namespace Connection MyBase.Connect() Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaConnectionFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaConnectionFailed & vbNewLine & ex.Message) Return False End Try End Function @@ -134,7 +134,7 @@ Namespace Connection ICA.Domain = _dom End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetCredentialsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetCredentialsFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -159,7 +159,7 @@ Namespace Connection ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, RDP.Resolutions.Items(Int(Info.Resolution)).Width, RDP.Resolutions.Items(Int(Info.Resolution)).Height, 0) End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetResolutionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetResolutionFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -200,7 +200,7 @@ Namespace Connection AddHandler ICA.OnConnectFailed, AddressOf ICAEvent_OnConnectFailed AddHandler ICA.OnDisconnect, AddressOf ICAEvent_OnDisconnect Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetEventHandlersFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetEventHandlersFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/Connection/Connection.Protocol.IntApp.vb b/mRemoteV1/Connection/Connection.Protocol.IntApp.vb index 885478ef..f8c91aca 100644 --- a/mRemoteV1/Connection/Connection.Protocol.IntApp.vb +++ b/mRemoteV1/Connection/Connection.Protocol.IntApp.vb @@ -110,11 +110,11 @@ Namespace Connection IntAppHandle = IntAppProcess.MainWindowHandle - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strIntAppStuff, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strIntAppStuff, True) - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppHandle, IntAppHandle.ToString), True) - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppTitle, IntAppProcess.MainWindowTitle), True) - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppHandle, IntAppHandle.ToString), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppTitle, IntAppProcess.MainWindowTitle), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True) SetParent(Me.IntAppHandle, Me.InterfaceControl.Parent.Handle) SetWindowLong(Me.IntAppHandle, 0, WS_VISIBLE) @@ -125,7 +125,7 @@ Namespace Connection MyBase.Connect() Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppConnectionFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppConnectionFailed & vbNewLine & ex.Message) Return False End Try End Function @@ -135,7 +135,7 @@ Namespace Connection Try SetForegroundWindow(IntAppHandle) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppFocusFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppFocusFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -143,7 +143,7 @@ Namespace Connection Try MoveWindow(IntAppHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), Me.InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), Me.InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppResizeFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppResizeFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -153,7 +153,7 @@ Namespace Connection IntAppProcess.Kill() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppKillFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppKillFailed & vbNewLine & ex.Message, True) End Try Try @@ -161,7 +161,7 @@ Namespace Connection IntAppProcess.Dispose() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppDisposeFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppDisposeFailed & vbNewLine & ex.Message, True) End Try MyBase.Close() diff --git a/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb b/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb index 971a3671..0988abfe 100644 --- a/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb +++ b/mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb @@ -165,11 +165,11 @@ Namespace Connection PuttyHandle = PuttyProcess.MainWindowHandle - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strPuttyStuff, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strPuttyStuff, True) - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyHandle, PuttyHandle.ToString), True) - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyTitle, PuttyProcess.MainWindowTitle), True) - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyHandle, PuttyHandle.ToString), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyTitle, PuttyProcess.MainWindowTitle), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True) SetParent(PuttyHandle, InterfaceControl.Parent.Handle) ShowWindow(PuttyHandle, SW_SHOWMAXIMIZED) @@ -178,7 +178,7 @@ Namespace Connection MyBase.Connect() Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyConnectionFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyConnectionFailed & vbNewLine & ex.Message) Return False End Try End Function @@ -187,7 +187,7 @@ Namespace Connection Try 'SetForegroundWindow(PuttyHandle) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyFocusFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyFocusFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -195,7 +195,7 @@ Namespace Connection Try MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), Me.InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), Me.InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyResizeFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyResizeFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -205,13 +205,13 @@ Namespace Connection PuttyProcess.Kill() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyKillFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyKillFailed & vbNewLine & ex.Message, True) End Try Try PuttyProcess.Dispose() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyDisposeFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyDisposeFailed & vbNewLine & ex.Message, True) End Try MyBase.Close() @@ -222,7 +222,7 @@ Namespace Connection PostMessage(Me.PuttyHandle, WM_SYSCOMMAND, IDM_RECONF, 0) SetForegroundWindow(Me.PuttyHandle) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -244,7 +244,7 @@ Namespace Connection Return arrKeys Catch ex As Exception - App.Runtime.mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strPuttyGetSessionsFailed & vbNewLine & ex.Message, True) + App.Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strPuttyGetSessionsFailed & vbNewLine & ex.Message, True) Return Nothing End Try End Function @@ -260,7 +260,7 @@ Namespace Connection mRemoteNG.Connection.PuttySession.PuttySessions = GetSessions() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyStartFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyStartFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/Connection/Connection.Protocol.RDP.vb b/mRemoteV1/Connection/Connection.Protocol.RDP.vb index 511b57bd..e5d02467 100644 --- a/mRemoteV1/Connection/Connection.Protocol.RDP.vb +++ b/mRemoteV1/Connection/Connection.Protocol.RDP.vb @@ -59,7 +59,7 @@ Namespace Connection System.Windows.Forms.Application.DoEvents() Loop Catch comEx As System.Runtime.InteropServices.COMException - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpControlCreationFailed & vbNewLine & vbNewLine & comEx.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpControlCreationFailed & vbNewLine & vbNewLine & comEx.Message) RDP.Dispose() Return False End Try @@ -100,7 +100,7 @@ Namespace Connection Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPropsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPropsFailed & vbNewLine & ex.Message, True) Return False End Try End Function @@ -113,7 +113,7 @@ Namespace Connection MyBase.Connect() Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpConnectionOpenFailed & vbNewLine & ex.Message) End Try Return False @@ -123,7 +123,7 @@ Namespace Connection Try RDP.Disconnect() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpDisconnectFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpDisconnectFailed & vbNewLine & ex.Message, True) MyBase.Close() End Try End Sub @@ -132,7 +132,7 @@ Namespace Connection Try Me.Fullscreen = Not Me.Fullscreen Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpToggleFullscreenFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpToggleFullscreenFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -140,7 +140,7 @@ Namespace Connection Try Me.SmartSize = Not Me.SmartSize Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpToggleSmartSizeFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpToggleSmartSizeFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -150,7 +150,7 @@ Namespace Connection RDP.Focus() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpFocusFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpFocusFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -159,7 +159,7 @@ Namespace Connection Private Sub SetRDGateway() Try If RDP.TransportSettings.GatewayIsSupported = 1 Then - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strRdpGatewayIsSupported, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strRdpGatewayIsSupported, True) If Me.Info.RDGatewayUsageMethod <> RDGatewayUsageMethod.Never Then RDP.TransportSettings2.GatewayProfileUsageMethod = 1 RDP.TransportSettings.GatewayUsageMethod = Me.Info.RDGatewayUsageMethod @@ -175,10 +175,10 @@ Namespace Connection End If End If Else - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strRdpGatewayNotSupported, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strRdpGatewayNotSupported, True) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetGatewayFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetGatewayFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -186,31 +186,31 @@ Namespace Connection Try If (Me.Force And Connection.Info.Force.UseConsoleSession) = Connection.Info.Force.UseConsoleSession Then If RDPVersion < Versions.RDC61 Then - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True) RDP.AdvancedSettings2.ConnectToServerConsole = True Else - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True) RDP.AdvancedSettings6.ConnectToAdministerServer = True End If ElseIf (Me.Force And Connection.Info.Force.DontUseConsoleSession) = Connection.Info.Force.DontUseConsoleSession Then If RDPVersion < Versions.RDC61 Then - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True) RDP.AdvancedSettings2.ConnectToServerConsole = False Else - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True) RDP.AdvancedSettings6.ConnectToAdministerServer = False End If Else If RDPVersion < Versions.RDC61 Then - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True) RDP.AdvancedSettings2.ConnectToServerConsole = Me.Info.UseConsoleSession Else - mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True) RDP.AdvancedSettings6.ConnectToAdministerServer = Me.Info.UseConsoleSession End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetConsoleSessionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetConsoleSessionFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -253,7 +253,7 @@ Namespace Connection RDP.Domain = _dom End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetCredentialsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetCredentialsFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -284,7 +284,7 @@ Namespace Connection RDP.DesktopHeight = Resolutions.Items(Int(Me.Info.Resolution)).Height End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetResolutionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetResolutionFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -294,7 +294,7 @@ Namespace Connection RDP.AdvancedSettings2.RDPPort = Me.Info.Port End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPortFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPortFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -307,7 +307,7 @@ Namespace Connection RDP.FullScreen = True End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetRedirectKeysFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetRedirectKeysFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -319,7 +319,7 @@ Namespace Connection RDP.AdvancedSettings2.RedirectSmartCards = Me.Info.RedirectSmartCards RDP.SecuredSettings2.AudioRedirectionMode = Int(Me.Info.RedirectSound) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetRedirectionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetRedirectionFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -344,7 +344,7 @@ Namespace Connection RDP.AdvancedSettings.PerformanceFlags = pFlags Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPerformanceFlagsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPerformanceFlagsFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -352,7 +352,7 @@ Namespace Connection Try RDP.AdvancedSettings5.AuthenticationLevel = Me.Info.RDPAuthenticationLevel Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetAuthenticationLevelFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetAuthenticationLevelFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -364,7 +364,7 @@ Namespace Connection AddHandler RDP.OnDisconnected, AddressOf RDPEvent_OnDisconnected AddHandler RDP.OnLeaveFullScreenMode, AddressOf RDPEvent_OnLeaveFullscreenMode Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetEventHandlersFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetEventHandlersFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -571,7 +571,7 @@ Namespace Connection End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddResolutionsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddResolutionsFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -598,7 +598,7 @@ Namespace Connection Return nRes Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddResolutionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddResolutionFailed & vbNewLine & ex.Message, True) End Try Return Nothing @@ -626,7 +626,7 @@ Namespace Connection Return True End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpOpenConnectionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpOpenConnectionFailed & vbNewLine & ex.Message, True) End Try Return False @@ -637,7 +637,7 @@ Namespace Connection oWTSCOM.WTSCloseServer(ServerHandle) ServerHandle = 0 Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpCloseConnectionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpCloseConnectionFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -667,7 +667,7 @@ Namespace Connection End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpGetSessionsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpGetSessionsFailed & vbNewLine & ex.Message, True) End Try Return colSessions @@ -706,7 +706,7 @@ Namespace Connection List.Add(newSes) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddSessionFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddSessionFailed & vbNewLine & ex.Message, True) End Try Return newSes @@ -780,7 +780,7 @@ Namespace Connection Try Return (_description(id)) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpErrorGetFailure & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpErrorGetFailure & vbNewLine & ex.Message, True) Return String.Format(My.Resources.strRdpErrorUnknown, id) End Try End Function diff --git a/mRemoteV1/Connection/Connection.Protocol.VNC.vb b/mRemoteV1/Connection/Connection.Protocol.VNC.vb index a1d97ef8..5f40da1e 100644 --- a/mRemoteV1/Connection/Connection.Protocol.VNC.vb +++ b/mRemoteV1/Connection/Connection.Protocol.VNC.vb @@ -112,7 +112,7 @@ Namespace Connection Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSetPropsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSetPropsFailed & vbNewLine & ex.Message, True) Return False End Try End Function @@ -123,7 +123,7 @@ Namespace Connection Try VNC.Connect(Me.Info.Hostname, Me.Info.VNCViewOnly, Info.VNCSmartSizeMode <> SmartSizeMode.SmartSNo) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncConnectionOpenFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncConnectionOpenFailed & vbNewLine & ex.Message) Return False End Try @@ -134,7 +134,7 @@ Namespace Connection Try VNC.Disconnect() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncConnectionDisconnectFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncConnectionDisconnectFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -147,7 +147,7 @@ Namespace Connection VNC.SendSpecialKeys(SpecialKeys.CtrlEsc) End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSendSpecialKeysFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSendSpecialKeysFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -156,7 +156,7 @@ Namespace Connection SmartSize = Not SmartSize RefreshScreen() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncToggleSmartSizeFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncToggleSmartSizeFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -164,7 +164,7 @@ Namespace Connection Try ViewOnly = Not ViewOnly Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncToggleViewOnlyFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncToggleViewOnlyFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -177,7 +177,7 @@ Namespace Connection ' mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support chat") 'End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncStartChatFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncStartChatFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -197,7 +197,7 @@ Namespace Connection Try VNC.FullScreenUpdate() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncRefreshFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncRefreshFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -212,7 +212,7 @@ Namespace Connection VNC.GetPassword = AddressOf VNCEvent_Authenticate End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSetEventHandlersFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSetEventHandlersFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/Connection/Connection.QuickConnect.vb b/mRemoteV1/Connection/Connection.QuickConnect.vb index 598a4147..4e6c4edb 100644 --- a/mRemoteV1/Connection/Connection.QuickConnect.vb +++ b/mRemoteV1/Connection/Connection.QuickConnect.vb @@ -13,7 +13,7 @@ Namespace Connection End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectHistoryExistsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectHistoryExistsFailed & vbNewLine & ex.Message, True) End Try Return False @@ -23,7 +23,7 @@ Namespace Connection Try qBox.Items.Insert(0, Text) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectAddFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectAddFailed & vbNewLine & ex.Message, True) End Try End Sub End Class diff --git a/mRemoteV1/Forms/frmChoosePanel.vb b/mRemoteV1/Forms/frmChoosePanel.vb index b74b77da..5537649b 100644 --- a/mRemoteV1/Forms/frmChoosePanel.vb +++ b/mRemoteV1/Forms/frmChoosePanel.vb @@ -27,8 +27,8 @@ Public Class frmChoosePanel Private Sub AddAvailablePanels() cbPanels.Items.Clear() - For i As Integer = 0 To wL.Count - 1 - cbPanels.Items.Add(wL(i).Text.Replace("&&", "&")) + For i As Integer = 0 To WindowList.Count - 1 + cbPanels.Items.Add(WindowList(i).Text.Replace("&&", "&")) Next If cbPanels.Items.Count > 0 Then diff --git a/mRemoteV1/Forms/frmMain.vb b/mRemoteV1/Forms/frmMain.vb index 9ca39376..8462c1c5 100644 --- a/mRemoteV1/Forms/frmMain.vb +++ b/mRemoteV1/Forms/frmMain.vb @@ -23,11 +23,10 @@ Public Class frmMain Startup.CreateLogger() ' Create gui config load and save objects - sL = New Config.Settings.Load(Me) - sS = New Config.Settings.Save(Me) + Dim SettingsLoad As New Config.Settings.Load(Me) ' Load GUI Configuration - sL.Load() + SettingsLoad.Load() Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now) @@ -37,12 +36,12 @@ Public Class frmMain fpChainedWindowHandle = SetClipboardViewer(Me.Handle) - mC = New Messages.Collector(Windows.errorsForm) + MessageCollector = New Messages.Collector(Windows.errorsForm) Connection.Protocol.RDP.Resolutions.AddResolutions() Connection.Protocol.PuttyBase.BorderSize = New Size(SystemInformation.FrameBorderSize.Width, SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height) 'Size.Subtract(Me.Size, Me.ClientSize) - wL = New UI.Window.List + WindowList = New UI.Window.List Startup.GetConnectionIcons() Startup.GetPuttySessions() @@ -145,7 +144,7 @@ Public Class frmMain End Sub Private Sub frmMain_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing - If My.Settings.ConfirmExit And wL.Count > 0 Then + If My.Settings.ConfirmExit And WindowList.Count > 0 Then Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.ProductName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing) If cTaskDialog.VerificationChecked Then My.Settings.ConfirmExit = False @@ -158,7 +157,7 @@ Public Class frmMain _IsClosing = True - For Each Window As UI.Window.Base In wL + For Each Window As UI.Window.Base In WindowList Window.Close() Next @@ -189,7 +188,7 @@ Public Class frmMain End Sub Private Sub tmrAutoSave_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tmrAutoSave.Tick - mC.AddMessage(Messages.MessageClass.InformationMsg, "Doing AutoSave", True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, "Doing AutoSave", True) App.Runtime.SaveConnections() End Sub #End Region @@ -205,7 +204,7 @@ Public Class frmMain tsExtAppsToolbar.Items.Clear() 'add ext apps - For Each extA As Tools.ExternalApp In ExtApps + For Each extA As Tools.ExternalApp In ExternalTools Dim nItem As New ToolStripButton nItem.Text = extA.DisplayName nItem.Image = extA.Image @@ -227,7 +226,7 @@ Public Class frmMain tsExtAppsToolbar.Items.Add(nItem) Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddExtAppsToToolbar failed (frmMain)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddExtAppsToToolbar failed (frmMain)" & vbNewLine & ex.Message, True) End Try End Sub @@ -317,7 +316,7 @@ Public Class frmMain End Sub Private Sub mMenFileLoad_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileLoad.Click - If App.Runtime.ConnectionsFileLoaded Then + If App.Runtime.IsConnectionsFileLoaded Then Select Case MsgBox(My.Resources.strSaveConnectionsFileBeforeOpeningAnother, MsgBoxStyle.YesNoCancel Or MsgBoxStyle.Question) Case MsgBoxResult.Yes App.Runtime.SaveConnections() @@ -370,9 +369,9 @@ Public Class frmMain Me.mMenViewConnectionPanels.DropDownItems.Clear() - For i As Integer = 0 To wL.Count - 1 - Dim tItem As New ToolStripMenuItem(wL(i).Text, wL(i).Icon.ToBitmap, AddressOf ConnectionPanelMenuItem_Click) - tItem.Tag = wL(i) + For i As Integer = 0 To WindowList.Count - 1 + Dim tItem As New ToolStripMenuItem(WindowList(i).Text, WindowList(i).Icon.ToBitmap, AddressOf ConnectionPanelMenuItem_Click) + tItem.Tag = WindowList(i) Me.mMenViewConnectionPanels.DropDownItems.Add(tItem) Next @@ -552,7 +551,7 @@ Public Class frmMain End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CreateButtons (frmMain) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CreateButtons (frmMain) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -574,7 +573,7 @@ Public Class frmMain 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) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "QuickyProtocolButton_Click (frmMain) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -665,7 +664,7 @@ Public Class frmMain AddHandler tMenItem.MouseDown, AddressOf ConMenItem_MouseDown Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -682,8 +681,8 @@ Public Class frmMain Private Sub frmMain_Resize(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Resize If Me.WindowState = FormWindowState.Minimized Then If My.Settings.MinimizeToTray Then - If App.Runtime.SysTrayIcon Is Nothing Then - App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon() + If App.Runtime.NotificationAreaIcon Is Nothing Then + App.Runtime.NotificationAreaIcon = New Tools.Controls.NotificationAreaIcon() End If Me.Hide() End If @@ -764,20 +763,20 @@ Public Class frmMain Private SysMenSubItems(50) As Integer Private Sub ResetSysMenuItems() - SysMenu.Reset() + SystemMenu.Reset() End Sub Private Sub AddSysMenuItems() - SysMenu = New Tools.SystemMenu(Me.Handle) - Dim popMen As IntPtr = SysMenu.CreatePopupMenuItem() + SystemMenu = New Tools.SystemMenu(Me.Handle) + Dim popMen As IntPtr = SystemMenu.CreatePopupMenuItem() For i As Integer = 0 To Screen.AllScreens.Length - 1 SysMenSubItems(i) = 200 + i - SysMenu.AppendMenuItem(popMen, Tools.SystemMenu.Flags.MF_STRING, SysMenSubItems(i), My.Resources.strScreen & " " & i + 1) + SystemMenu.AppendMenuItem(popMen, Tools.SystemMenu.Flags.MF_STRING, SysMenSubItems(i), My.Resources.strScreen & " " & i + 1) Next - SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 0, Tools.SystemMenu.Flags.MF_POPUP Or Tools.SystemMenu.Flags.MF_BYPOSITION, popMen, My.Resources.strSendTo) - SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 1, Tools.SystemMenu.Flags.MF_BYPOSITION Or Tools.SystemMenu.Flags.MF_SEPARATOR, IntPtr.Zero, Nothing) + SystemMenu.InsertMenuItem(SystemMenu.SystemMenuHandle, 0, Tools.SystemMenu.Flags.MF_POPUP Or Tools.SystemMenu.Flags.MF_BYPOSITION, popMen, My.Resources.strSendTo) + SystemMenu.InsertMenuItem(SystemMenu.SystemMenuHandle, 1, Tools.SystemMenu.Flags.MF_BYPOSITION Or Tools.SystemMenu.Flags.MF_SEPARATOR, IntPtr.Zero, Nothing) End Sub #End Region End Class diff --git a/mRemoteV1/Forms/frmOptions.vb b/mRemoteV1/Forms/frmOptions.vb index 9f9ac98b..2c0c75c3 100644 --- a/mRemoteV1/Forms/frmOptions.vb +++ b/mRemoteV1/Forms/frmOptions.vb @@ -1506,7 +1506,7 @@ Public Class frmOptions Me.txtXULrunnerPath.Text = My.Settings.XULRunnerPath Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadOptions (UI.Window.Options) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LoadOptions (UI.Window.Options) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1529,13 +1529,13 @@ Public Class frmOptions My.Settings.MinimizeToTray = Me.chkMinimizeToSystemTray.Checked If My.Settings.ShowSystemTrayIcon Then - If App.Runtime.SysTrayIcon Is Nothing Then - App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon + If App.Runtime.NotificationAreaIcon Is Nothing Then + App.Runtime.NotificationAreaIcon = New Tools.Controls.NotificationAreaIcon End If Else - If App.Runtime.SysTrayIcon IsNot Nothing Then - App.Runtime.SysTrayIcon.Dispose() - App.Runtime.SysTrayIcon = Nothing + If App.Runtime.NotificationAreaIcon IsNot Nothing Then + App.Runtime.NotificationAreaIcon.Dispose() + App.Runtime.NotificationAreaIcon = Nothing End If End If @@ -1639,7 +1639,7 @@ Public Class frmOptions App.Runtime.Startup.CreateSQLUpdateHandlerAndStartTimer() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveOptions (UI.Window.Options) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveOptions (UI.Window.Options) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/Security/Security.Crypt.vb b/mRemoteV1/Security/Security.Crypt.vb index 8c580caa..9290a7fb 100644 --- a/mRemoteV1/Security/Security.Crypt.vb +++ b/mRemoteV1/Security/Security.Crypt.vb @@ -37,7 +37,7 @@ Namespace Security Return Convert.ToBase64String(encdata) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Encryption failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Encryption failed" & vbNewLine & ex.Message, True) End Try Return StrToEncrypt @@ -74,7 +74,7 @@ Namespace Security Return System.Text.Encoding.UTF8.GetString(data, 0, i) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Decryption failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Decryption failed" & vbNewLine & ex.Message, True) End Try Return StrToDecrypt diff --git a/mRemoteV1/Security/Security.Impersonator.vb b/mRemoteV1/Security/Security.Impersonator.vb index b4269b88..cd15fc0d 100644 --- a/mRemoteV1/Security/Security.Impersonator.vb +++ b/mRemoteV1/Security/Security.Impersonator.vb @@ -82,7 +82,7 @@ Namespace Security impersonatedUser = newId.Impersonate() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Starting Impersonation failed (Sessions feature will not work)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Starting Impersonation failed (Sessions feature will not work)" & vbNewLine & ex.Message, True) End Try End Sub @@ -93,7 +93,7 @@ Namespace Security Try impersonatedUser.Undo() ' Stop impersonating the user. Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "Stopping Impersonation failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Stopping Impersonation failed" & vbNewLine & ex.Message, True) Throw ex Finally diff --git a/mRemoteV1/Tools/Tools.Controls.vb b/mRemoteV1/Tools/Tools.Controls.vb index 9ffef4f1..13d2d1c3 100644 --- a/mRemoteV1/Tools/Tools.Controls.vb +++ b/mRemoteV1/Tools/Tools.Controls.vb @@ -37,7 +37,7 @@ Namespace Tools End Class - Public Class SysTrayIcon + Public Class NotificationAreaIcon Private _nI As NotifyIcon Private _cMen As ContextMenuStrip @@ -87,7 +87,7 @@ Namespace Tools AddHandler Me._nI.MouseClick, AddressOf nI_MouseClick AddHandler Me._nI.MouseDoubleClick, AddressOf nI_MouseDoubleClick Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new SysTrayIcon failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new SysTrayIcon failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -98,7 +98,7 @@ Namespace Tools Me._cMen.Dispose() Me._Disposed = True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Disposing SysTrayIcon failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Disposing SysTrayIcon failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -135,7 +135,7 @@ Namespace Tools AddHandler tMenItem.MouseDown, AddressOf ConMenItem_MouseDown Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -152,8 +152,8 @@ Namespace Tools frmMain.WindowState = frmMain.prevWindowsState If My.Settings.ShowSystemTrayIcon = False Then - App.Runtime.SysTrayIcon.Dispose() - App.Runtime.SysTrayIcon = Nothing + App.Runtime.NotificationAreaIcon.Dispose() + App.Runtime.NotificationAreaIcon = Nothing End If End Sub diff --git a/mRemoteV1/Tools/Tools.ExternalApp.vb b/mRemoteV1/Tools/Tools.ExternalApp.vb index 2bd7bb8a..53d5be2d 100644 --- a/mRemoteV1/Tools/Tools.ExternalApp.vb +++ b/mRemoteV1/Tools/Tools.ExternalApp.vb @@ -133,7 +133,7 @@ Namespace Tools Return p Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't start external application." & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't start external application." & vbNewLine & ex.Message) Return Nothing End Try End Function @@ -193,7 +193,7 @@ Namespace Tools pText = Replace(pText, "%UserField%", "", , , CompareMethod.Text) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "ParseText failed (Tools.ExternalApp)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "ParseText failed (Tools.ExternalApp)" & vbNewLine & ex.Message, True) End Try Return pText diff --git a/mRemoteV1/Tools/Tools.Misc.vb b/mRemoteV1/Tools/Tools.Misc.vb index f8b7ff10..bb27c067 100644 --- a/mRemoteV1/Tools/Tools.Misc.vb +++ b/mRemoteV1/Tools/Tools.Misc.vb @@ -54,7 +54,7 @@ Namespace Tools Return myIcon Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "GetIconFromFile failed (Tools.Misc)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetIconFromFile failed (Tools.Misc)" & vbNewLine & ex.Message, True) Return Nothing End Try End Function @@ -98,9 +98,9 @@ Namespace Tools RaiseEvent SQLUpdateCheckFinished(False) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "IsSQLUpdateAvailable failed (Tools.Misc)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsSQLUpdateAvailable failed (Tools.Misc)" & vbNewLine & ex.Message, True) End Try - + Return False End Function @@ -174,7 +174,7 @@ Namespace Tools Next Dim ex As New Exception(String.Format("Can't convert {0} to {1}", value, t.ToString)) - mC.AddMessage(Messages.MessageClass.ErrorMsg, "StringToEnum failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StringToEnum failed" & vbNewLine & ex.Message, True) Throw ex End Function @@ -193,7 +193,7 @@ Namespace Tools Return ScreenToBitmap Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Taking Screenshot failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Taking Screenshot failed" & vbNewLine & ex.Message, True) End Try Return Nothing @@ -315,7 +315,7 @@ Namespace Tools SetWinFullScreen(targetForm.Handle) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Entering Fullscreen failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Entering Fullscreen failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -332,7 +332,7 @@ Namespace Tools targetForm.Bounds = bounds FullscreenActive = False Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Exiting Fullscreen failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Exiting Fullscreen failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -351,7 +351,7 @@ Namespace Tools Dim curScreen As Screen = Screen.FromHandle(targetForm.Handle) SetWindowPos(hwnd, HWND_TOP, curScreen.Bounds.Left, curScreen.Bounds.Top, curScreen.Bounds.Right, curScreen.Bounds.Bottom, SWP_SHOWWINDOW) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SetWindowPos failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SetWindowPos failed" & vbNewLine & ex.Message, True) End Try End Sub End Class @@ -439,7 +439,7 @@ Namespace Tools End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new Args failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Creating new Args failed" & vbNewLine & ex.Message, True) End Try End Sub End Class diff --git a/mRemoteV1/Tools/Tools.PortScan.vb b/mRemoteV1/Tools/Tools.PortScan.vb index 86798449..ce69d85a 100644 --- a/mRemoteV1/Tools/Tools.PortScan.vb +++ b/mRemoteV1/Tools/Tools.PortScan.vb @@ -223,7 +223,7 @@ Namespace Tools Try Return "SSH: " & _SSH & " Telnet: " & _Telnet & " HTTP: " & _HTTP & " HTTPS: " & _HTTPS & " Rlogin: " & _Rlogin & " RDP: " & _RDP & " VNC: " & _VNC Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "ToString failed (Tools.PortScan)", True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "ToString failed (Tools.PortScan)", True) Return "" End Try End Function @@ -264,7 +264,7 @@ Namespace Tools Return lvI Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "ToString failed (Tools.PortScan)", True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "ToString failed (Tools.PortScan)", True) Return Nothing End Try End Function @@ -476,7 +476,7 @@ Namespace Tools RaiseEvent ScanComplete(_ScannedHosts) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "StartScanBG failed (Tools.PortScan)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "StartScanBG failed (Tools.PortScan)" & vbNewLine & ex.Message, True) End Try End Sub @@ -527,7 +527,7 @@ Namespace Tools Return arrIPs Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "GetIPRange failed (Tools.PortScan)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetIPRange failed (Tools.PortScan)" & vbNewLine & ex.Message, True) Return Nothing End Try End Function @@ -547,7 +547,7 @@ Namespace Tools Next Return True Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, "matchIP failed (Tools.PortScan)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "matchIP failed (Tools.PortScan)" & vbNewLine & ex.Message, True) Return False End Try End Function diff --git a/mRemoteV1/Tree/Tree.Node.vb b/mRemoteV1/Tree/Tree.Node.vb index af662091..29563073 100644 --- a/mRemoteV1/Tree/Tree.Node.vb +++ b/mRemoteV1/Tree/Tree.Node.vb @@ -100,7 +100,7 @@ Namespace Tree Return Type.Connection End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get node type" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get node type" & vbNewLine & ex.Message, True) End Try Return Type.NONE @@ -117,7 +117,7 @@ Namespace Tree Return Type.Connection End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get node type from string" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get node type from string" & vbNewLine & ex.Message, True) End Try Return Type.NONE @@ -138,7 +138,7 @@ Namespace Tree Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" & vbNewLine & ex.Message, True) End Try Return Nothing @@ -159,7 +159,7 @@ Namespace Tree Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Find node failed" & vbNewLine & ex.Message, True) End Try Return Nothing @@ -171,7 +171,7 @@ Namespace Tree Return False End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "IsEmpty (Tree.Node) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "IsEmpty (Tree.Node) failed" & vbNewLine & ex.Message, True) End Try Return True @@ -204,7 +204,7 @@ Namespace Tree Return nNode Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNode failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNode failed" & vbNewLine & ex.Message, True) End Try Return Nothing @@ -241,7 +241,7 @@ Namespace Tree SelectedNode.Nodes.Add(adCNode) SelectedNode = SelectedNode.Nodes(SelectedNode.Nodes.Count - 1) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddADNodes failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddADNodes failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -292,7 +292,7 @@ Namespace Tree rNode.Nodes.Add(adNode) Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CreateADSubNodes failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CreateADSubNodes failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -343,7 +343,7 @@ Namespace Tree Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strErrorCloneNodeFailed, ex.Message)) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strErrorCloneNodeFailed, ex.Message)) End Try End Sub @@ -382,7 +382,7 @@ Namespace Tree End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SetNodeToolTip failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SetNodeToolTip failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -393,7 +393,7 @@ Namespace Tree Select Case Tree.Node.GetNodeType(SelectedNode) Case Type.Root - mC.AddMessage(Messages.MessageClass.WarningMsg, "The root item cannot be deleted!") + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "The root item cannot be deleted!") Case Type.Container If Tree.Node.IsEmpty(SelectedNode) = False Then If MsgBox(String.Format(My.Resources.strConfirmDeleteNodeFolder, SelectedNode.Text), MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.Yes Then @@ -412,10 +412,10 @@ Namespace Tree SelectedNode.Remove() End If Case Else - mC.AddMessage(Messages.MessageClass.WarningMsg, "Tree item type is unknown so it cannot be deleted!") + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Tree item type is unknown so it cannot be deleted!") End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Deleting selected node failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Deleting selected node failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -448,7 +448,7 @@ Namespace Tree End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeUp failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeUp failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -464,7 +464,7 @@ Namespace Tree End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeDown failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MoveNodeDown failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -495,7 +495,7 @@ Namespace Tree If GetNodeType(childNode) = Type.Container Then Sort(childNode, sortType) Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Sort nodes failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Sort nodes failed" & vbNewLine & ex.Message, True) End Try End Sub diff --git a/mRemoteV1/UI/UI.Window.About.vb b/mRemoteV1/UI/UI.Window.About.vb index a49e69ad..fd6c441b 100644 --- a/mRemoteV1/UI/UI.Window.About.vb +++ b/mRemoteV1/UI/UI.Window.About.vb @@ -305,7 +305,7 @@ Namespace UI sR.Close() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Loading About failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Loading About failed" & vbNewLine & ex.Message, True) End Try End Sub diff --git a/mRemoteV1/UI/UI.Window.Announcment.vb b/mRemoteV1/UI/UI.Window.Announcment.vb index 4d12e4e2..7e7c7c73 100644 --- a/mRemoteV1/UI/UI.Window.Announcment.vb +++ b/mRemoteV1/UI/UI.Window.Announcment.vb @@ -77,7 +77,7 @@ Namespace UI uT.Start() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CheckForAnnouncement (UI.Window.Announcement) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CheckForAnnouncement (UI.Window.Announcement) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -91,7 +91,7 @@ Namespace UI RaiseEvent AnnouncementCheckCompleted(False) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CheckForAnnouncementBG (UI.Window.Announcement) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CheckForAnnouncementBG (UI.Window.Announcement) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -100,7 +100,7 @@ Namespace UI wBrowser.Navigate(aN.curAI.URL) My.Settings.LastAnnouncement = aN.curAI.Name Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AnnouncementCheckComplete (UI.Window.Announcement) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AnnouncementCheckComplete (UI.Window.Announcement) failed" & vbNewLine & ex.Message, True) End Try End Sub End Class diff --git a/mRemoteV1/UI/UI.Window.ComponentsCheck.vb b/mRemoteV1/UI/UI.Window.ComponentsCheck.vb index 4ea73fb9..32a20fd1 100644 --- a/mRemoteV1/UI/UI.Window.ComponentsCheck.vb +++ b/mRemoteV1/UI/UI.Window.ComponentsCheck.vb @@ -510,8 +510,8 @@ Namespace UI lblCheck1.Text = "RDP (Remote Desktop) " & My.Resources.strCcCheckFailed txtCheck1.Text = My.Resources.strCcRDPFailed - mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP " & errorMsg, True) - mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "RDP " & errorMsg, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) End Try If RDP IsNot Nothing Then RDP.Dispose() @@ -538,7 +538,7 @@ Namespace UI lblCheck2.Text = "VNC (Virtual Network Computing) " & My.Resources.strCcCheckFailed txtCheck2.Text = My.Resources.strCcVNCFailed - mC.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True) 'mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) End Try @@ -563,8 +563,8 @@ Namespace UI lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " & My.Resources.strCcCheckFailed txtCheck3.Text = My.Resources.strCcPuttyFailed - mC.AddMessage(Messages.MessageClass.WarningMsg, "PuTTY " & errorMsg, True) - mC.AddMessage(Messages.MessageClass.ErrorMsg, "File " & pPath & " does not exist.", True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "PuTTY " & errorMsg, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "File " & pPath & " does not exist.", True) End If @@ -590,8 +590,8 @@ Namespace UI lblCheck4.Text = "ICA (Citrix ICA) " & My.Resources.strCcCheckFailed txtCheck4.Text = My.Resources.strCcICAFailed - mC.AddMessage(Messages.MessageClass.WarningMsg, "ICA " & errorMsg, True) - mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "ICA " & errorMsg, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) End Try If ICA IsNot Nothing Then ICA.Dispose() @@ -622,8 +622,8 @@ Namespace UI lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " & My.Resources.strCcCheckFailed txtCheck5.Text = My.Resources.strCcGeckoFailed - mC.AddMessage(Messages.MessageClass.WarningMsg, "Gecko " & errorMsg, True) - mC.AddMessage(Messages.MessageClass.ErrorMsg, "XULrunner was not found in " & My.Settings.XULRunnerPath, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Gecko " & errorMsg, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "XULrunner was not found in " & My.Settings.XULRunnerPath, True) End If @@ -642,8 +642,8 @@ Namespace UI lblCheck6.Text = "(RDP) Sessions " & My.Resources.strCcCheckFailed txtCheck6.Text = My.Resources.strCcEOLFailed - mC.AddMessage(Messages.MessageClass.WarningMsg, "EOLWTSCOM " & errorMsg, True) - mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "EOLWTSCOM " & errorMsg, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.Config.vb b/mRemoteV1/UI/UI.Window.Config.vb index 67b153ff..8c6c8100 100644 --- a/mRemoteV1/UI/UI.Window.Config.vb +++ b/mRemoteV1/UI/UI.Window.Config.vb @@ -390,7 +390,7 @@ Namespace UI Me.ShowHideGridItems() Me.SetHostStatus(Obj) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridObjectFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridObjectFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -431,7 +431,7 @@ Namespace UI tsDefault.Items(tsDefault.Items.Count - 1).Visible = False ToolStripManager.Merge(tsCustom, tsDefault) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigUiLoadFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigUiLoadFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -498,7 +498,7 @@ Namespace UI Me.ShowHideGridItems() App.Runtime.SaveConnectionsBG() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridValueFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridValueFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -1123,7 +1123,7 @@ Namespace UI Me.pGrid.Refresh() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridHideItemsFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridHideItemsFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -1205,7 +1205,7 @@ Namespace UI Me.cMenIcons.Show(mPos) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridButtonIconClickFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridButtonIconClickFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -1221,7 +1221,7 @@ Namespace UI App.Runtime.SaveConnectionsBG() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridMenuClickFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridMenuClickFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -1282,7 +1282,7 @@ Namespace UI pThread.IsBackground = True pThread.Start() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridSetHostStatusFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConfigPropertyGridSetHostStatusFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.Connection.vb b/mRemoteV1/UI/UI.Window.Connection.vb index 7b211576..dd209950 100644 --- a/mRemoteV1/UI/UI.Window.Connection.vb +++ b/mRemoteV1/UI/UI.Window.Connection.vb @@ -275,7 +275,7 @@ Namespace UI Return nTab Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddConnectionTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddConnectionTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try Return Nothing @@ -326,7 +326,7 @@ Namespace UI End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Connection_FormClosing (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Connection_FormClosing (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -341,7 +341,7 @@ Namespace UI End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Connection_Resize (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Connection_Resize (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -375,7 +375,7 @@ Namespace UI Me.CloseTab(SelectedTab) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CloseConnectionTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CloseConnectionTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -461,7 +461,7 @@ Namespace UI AddExternalApps() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideMenuButtons (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideMenuButtons (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -545,7 +545,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleSmartSize (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleSmartSize (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -563,7 +563,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "TransferFile (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TransferFile (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -581,7 +581,7 @@ Namespace UI Windows.sshtransferForm.Password = conI.Password Windows.sshtransferForm.Port = conI.Port Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -591,7 +591,7 @@ Namespace UI 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) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "VNCTransferFile (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -610,7 +610,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleViewOnly (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleViewOnly (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -627,7 +627,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartChat (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartChat (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -644,7 +644,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshScreen (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshScreen (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -661,7 +661,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SendSpecialKeys (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SendSpecialKeys (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -678,7 +678,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleFullscreen (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ToggleFullscreen (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -696,7 +696,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ShowPuttySettingsDialog (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowPuttySettingsDialog (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -706,7 +706,7 @@ Namespace UI cmenTabExternalApps.DropDownItems.Clear() 'add ext apps - For Each extA As Tools.ExternalApp In ExtApps + For Each extA As Tools.ExternalApp In ExternalTools Dim nItem As New ToolStripMenuItem nItem.Text = extA.DisplayName nItem.Tag = extA @@ -718,7 +718,7 @@ Namespace UI cmenTabExternalApps.DropDownItems.Add(nItem) Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) End Try End Sub @@ -733,7 +733,7 @@ Namespace UI End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "cmenTabExternalAppsEntry_Click failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cmenTabExternalAppsEntry_Click failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) End Try End Sub @@ -747,7 +747,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CloseTabMenu (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CloseTabMenu (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -761,7 +761,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "DuplicateTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "DuplicateTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -778,7 +778,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Reconnect (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Reconnect (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -790,7 +790,7 @@ Namespace UI Me.TabController.SelectedTab.Title = nTitle.Replace("&", "&&") End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "RenameTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RenameTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -813,7 +813,7 @@ Namespace UI Catch comEx As System.Runtime.InteropServices.COMException Me.TabController.Invoke(s, TabToBeClosed) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't close tab" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't close tab" & vbNewLine & ex.Message, True) End Try Else Try @@ -821,7 +821,7 @@ Namespace UI Catch comEx As System.Runtime.InteropServices.COMException CloseTab(TabToBeClosed) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't close tab" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't close tab" & vbNewLine & ex.Message, True) End Try If Me.TabController.TabPages.Count = 0 Then @@ -844,7 +844,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "FocusIC (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "FocusIC (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -860,7 +860,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshIC (UI.Window.Connection) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RefreshIC (UI.Window.Connection) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -899,7 +899,7 @@ Namespace UI Me.Cursor = Cursors.Default End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseLeave (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseLeave (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -915,7 +915,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseMove (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseMove (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -953,7 +953,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseUp (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "TabController_MouseUp (UI.Window.Connections) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb b/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb index dd6f934f..9309a3e8 100644 --- a/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb +++ b/mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb @@ -213,7 +213,7 @@ Namespace UI Me._Layout = ControlLayout.Vertical Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutVertical (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutVertical (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -229,7 +229,7 @@ Namespace UI Me._Layout = ControlLayout.Horizontal Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutHorizontal (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LayoutHorizontal (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -247,7 +247,7 @@ Namespace UI Me.lvErrorCollector.Columns(0).Width = Me.lvErrorCollector.Width - 20 Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ErrorsAndInfos_Resize (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ErrorsAndInfos_Resize (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -259,7 +259,7 @@ Namespace UI Me.txtMsgText.BackColor = Color.FromKnownColor(KnownColor.Control) Me.lblMsgDate.Text = "" Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "pnlErrorMsg_ResetDefaultStyle (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "pnlErrorMsg_ResetDefaultStyle (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -276,7 +276,7 @@ Namespace UI End Try End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "MC_KeyDown (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "MC_KeyDown (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -307,7 +307,7 @@ Namespace UI Me.lblMsgDate.Text = eMsg.MsgDate Me.txtMsgText.Text = eMsg.MsgText Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "lvErrorCollector_SelectedIndexChanged (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "lvErrorCollector_SelectedIndexChanged (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -331,7 +331,7 @@ Namespace UI Clipboard.SetText(strCopyText) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CopyMessageToClipboard (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CopyMessageToClipboard (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -347,7 +347,7 @@ Namespace UI Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "DeleteMessages (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "DeleteMessages (UI.Window.ErrorsAndInfos) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.ExternalApps.vb b/mRemoteV1/UI/UI.Window.ExternalApps.vb index 3ad4c6ec..cc633d12 100644 --- a/mRemoteV1/UI/UI.Window.ExternalApps.vb +++ b/mRemoteV1/UI/UI.Window.ExternalApps.vb @@ -302,7 +302,7 @@ Namespace UI Try lvApps.Items.Clear() - For Each extA As Tools.ExternalApp In ExtApps + For Each extA As Tools.ExternalApp In ExternalTools Dim lvItem As New ListViewItem lvItem.Text = extA.DisplayName lvItem.SubItems.Add(extA.FileName) @@ -322,7 +322,7 @@ Namespace UI RefreshToolbar() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadApps failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "LoadApps failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) End Try End Sub @@ -337,7 +337,7 @@ Namespace UI _SelApp = SelApp End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetAppProperties failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "GetAppProperties failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) End Try End Sub @@ -353,14 +353,14 @@ Namespace UI LoadApps() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SetAppProperties failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SetAppProperties failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) End Try End Sub Private Sub AddNewApp() Try Dim nExtA As New Tools.ExternalApp("New Application") - ExtApps.Add(nExtA) + ExternalTools.Add(nExtA) LoadApps() lvApps.SelectedItems.Clear() @@ -372,7 +372,7 @@ Namespace UI End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNewApp failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNewApp failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) End Try End Sub @@ -390,7 +390,7 @@ Namespace UI If MsgBox(Prompt, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then For Each lvItem As ListViewItem In lvApps.SelectedItems - ExtApps.Remove(lvItem.Tag) + ExternalTools.Remove(lvItem.Tag) lvItem.Tag = Nothing lvItem.Remove() Next @@ -398,7 +398,7 @@ Namespace UI RefreshToolbar() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "RemoveApps failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "RemoveApps failed (UI.Window.ExternalApps)" & vbNewLine & ex.Message, True) End Try End Sub @@ -408,7 +408,7 @@ Namespace UI 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) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "StartApp failed (UI.Window.ExternalApps" & vbNewLine & ex.Message, True) End Try End Sub diff --git a/mRemoteV1/UI/UI.Window.PortScan.vb b/mRemoteV1/UI/UI.Window.PortScan.vb index 3f1fd810..36779b0b 100644 --- a/mRemoteV1/UI/UI.Window.PortScan.vb +++ b/mRemoteV1/UI/UI.Window.PortScan.vb @@ -385,7 +385,7 @@ Namespace UI cbProtocol.SelectedIndex = 0 End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPortScanCouldNotLoadPanel & vbNewLine & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPortScanCouldNotLoadPanel & vbNewLine & vbNewLine & ex.Message) End Try End Sub @@ -412,7 +412,7 @@ Namespace UI If ipOK() Then StartScan() Else - mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strCannotStartPortScan) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strCannotStartPortScan) End If End If End Sub @@ -495,7 +495,7 @@ Namespace UI pScanner.StartScan() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartScan failed (UI.Window.PortScan)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartScan failed (UI.Window.PortScan)" & vbNewLine & ex.Message, True) End Try End Sub @@ -522,11 +522,11 @@ Namespace UI #Region "Event Handlers" Private Sub Event_BeginHostScan(ByVal Host As String) - mC.AddMessage(Messages.MessageClass.InformationMsg, "Scanning " & Host, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, "Scanning " & Host, True) End Sub Private Sub Event_HostScanned(ByVal Host As Tools.PortScan.ScanHost, ByVal AlreadyScanned As Integer, ByVal ToBeScanned As Integer) - mC.AddMessage(Messages.MessageClass.InformationMsg, "Host scanned " & Host.HostIP, True) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, "Host scanned " & Host.HostIP, True) Dim lvI As ListViewItem = Host.ToListViewItem(psMode) AddListViewItem(lvI) @@ -537,7 +537,7 @@ Namespace UI Private Sub Event_ScanComplete(ByVal Hosts As ArrayList) scanning = False SwitchButtonText() - mC.AddMessage(Messages.MessageClass.InformationMsg, "Scan complete!") + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, "Scan complete!") End Sub #End Region End Class diff --git a/mRemoteV1/UI/UI.Window.QuickConnect.vb b/mRemoteV1/UI/UI.Window.QuickConnect.vb index d5e01a91..ef0273d4 100644 --- a/mRemoteV1/UI/UI.Window.QuickConnect.vb +++ b/mRemoteV1/UI/UI.Window.QuickConnect.vb @@ -104,7 +104,7 @@ Namespace UI End If Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CreateButtons (UI.Window.QuickConnect) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CreateButtons (UI.Window.QuickConnect) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -128,7 +128,7 @@ Namespace UI Me.Hide() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ProtocolButton_Click (UI.Window.QuickConnect) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ProtocolButton_Click (UI.Window.QuickConnect) failed" & vbNewLine & ex.Message, True) End Try End Sub End Class diff --git a/mRemoteV1/UI/UI.Window.SSHTransfer.vb b/mRemoteV1/UI/UI.Window.SSHTransfer.vb index c9e85634..1db5a28a 100644 --- a/mRemoteV1/UI/UI.Window.SSHTransfer.vb +++ b/mRemoteV1/UI/UI.Window.SSHTransfer.vb @@ -369,12 +369,12 @@ Namespace UI #Region "Private Methods" Private Sub StartTransfer(ByVal Protocol As SSHTransferProtocol) If AllFieldsSet() = False Then - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPleaseFillAllFields) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPleaseFillAllFields) Exit Sub End If If File.Exists(Me.txtLocalFile.Text) = False Then - mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strLocalFileDoesNotExist) + MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strLocalFileDoesNotExist) Exit Sub End If @@ -399,7 +399,7 @@ Namespace UI t.IsBackground = True t.Start() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHTransferFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHTransferFailed & vbNewLine & ex.Message) Me.sshT.Close() End Try End Sub @@ -412,7 +412,7 @@ Namespace UI DisableButtons() Me.sshT.Put(LocalFile, RemoteFile) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHStartTransferBG & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHStartTransferBG & vbNewLine & ex.Message, True) End Try End Sub @@ -491,7 +491,7 @@ Namespace UI EnableButtons() SetStatus() - mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strSSHTransferFailed) + MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strSSHTransferFailed) If Me.sshT IsNot Nothing Then Me.sshT.Close() @@ -499,7 +499,7 @@ Namespace UI Me.sshT.Close() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHTransferEndFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHTransferEndFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.SaveAs.vb b/mRemoteV1/UI/UI.Window.SaveAs.vb index d811c3fe..fde8000f 100644 --- a/mRemoteV1/UI/UI.Window.SaveAs.vb +++ b/mRemoteV1/UI/UI.Window.SaveAs.vb @@ -215,7 +215,7 @@ Namespace UI App.Runtime.SaveConnectionsAs(sS, _TreeNode) Me.Close() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "btnOK_Click (UI.Window.SaveAs) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "btnOK_Click (UI.Window.SaveAs) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.ScreenshotManager.vb b/mRemoteV1/UI/UI.Window.ScreenshotManager.vb index 8283838a..159e42fb 100644 --- a/mRemoteV1/UI/UI.Window.ScreenshotManager.vb +++ b/mRemoteV1/UI/UI.Window.ScreenshotManager.vb @@ -180,7 +180,7 @@ Namespace UI Me.Show(frmMain.pnlDock) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddScreenshot (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddScreenshot (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -232,7 +232,7 @@ Namespace UI nForm.ShowDialog() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "OpenScreenshot (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "OpenScreenshot (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -240,7 +240,7 @@ Namespace UI Try sender.Parent.Dispose() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "btnCloseScreenshot_Click (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "btnCloseScreenshot_Click (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -279,7 +279,7 @@ Namespace UI Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveAllImages (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveAllImages (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -291,7 +291,7 @@ Namespace UI Try Clipboard.SetImage(TryCast(cMenScreenshot.Tag, PictureBox).Image) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "CopyImageToClipboard (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CopyImageToClipboard (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -314,7 +314,7 @@ Namespace UI End Select End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveSingleImage (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveSingleImage (UI.Window.ScreenshotManager) failed" & vbNewLine & ex.Message, True) End Try End Sub diff --git a/mRemoteV1/UI/UI.Window.Sessions.vb b/mRemoteV1/UI/UI.Window.Sessions.vb index 0662d5cb..55a82b25 100644 --- a/mRemoteV1/UI/UI.Window.Sessions.vb +++ b/mRemoteV1/UI/UI.Window.Sessions.vb @@ -178,7 +178,7 @@ Namespace UI sU = Nothing tS.CloseConnection(tServerHandle) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionGetFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionGetFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -214,7 +214,7 @@ Namespace UI GetSessionsBG() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionKillFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionKillFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -297,7 +297,7 @@ Namespace UI Me.GetSessions(conI.Hostname, sUser, sPass, sDom) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessionsAuto (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessionsAuto (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -359,7 +359,7 @@ Namespace UI threadSessions.IsBackground = True threadSessions.Start() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessions (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessions (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -402,7 +402,7 @@ Namespace UI threadSessions.IsBackground = True threadSessions.Start() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "KillSession (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "KillSession (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.Tree.vb b/mRemoteV1/UI/UI.Window.Tree.vb index 30671b13..8057d3f9 100644 --- a/mRemoteV1/UI/UI.Window.Tree.vb +++ b/mRemoteV1/UI/UI.Window.Tree.vb @@ -536,7 +536,7 @@ Namespace UI Me.imgListTree.Images.Add(My.Resources.Play) Me.imgListTree.Images.Add(My.Resources.Pause) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "FillImageList (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "FillImageList (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -553,7 +553,7 @@ Namespace UI Me.ShowHideTreeContextMenuItems(e.Node) SaveConnectionsBG() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterLabelEdit (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterLabelEdit (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -577,7 +577,7 @@ Namespace UI 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) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterSelect (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -596,7 +596,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_NodeMouseClick (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_NodeMouseClick (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -610,7 +610,7 @@ Namespace UI Try 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) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_MouseMove (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -624,7 +624,7 @@ Namespace UI Next End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "IsConnectionOpen (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "IsConnectionOpen (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try Return False @@ -737,7 +737,7 @@ Namespace UI Me.cMenTree.Enabled = False End Select Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideTreeContextMenuItems (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ShowHideTreeContextMenuItems (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -803,7 +803,7 @@ Namespace UI SaveConnectionsBG() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragDrop (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragDrop (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -818,7 +818,7 @@ Namespace UI e.Effect = DragDropEffects.None End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragEnter (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragEnter (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -860,7 +860,7 @@ Namespace UI 'Currently selected node is a suitable target e.Effect = DragDropEffects.Move Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragOver (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_DragOver (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -869,7 +869,7 @@ Namespace UI 'Set the drag node and initiate the DragDrop DoDragDrop(e.Item, DragDropEffects.Move) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_ItemDrag (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_ItemDrag (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -1017,7 +1017,7 @@ Namespace UI Me.tvConnections.SelectedNode.BeginEdit() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddConnection (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddConnection (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1051,7 +1051,7 @@ Namespace UI Me.tvConnections.SelectedNode = newNode Me.tvConnections.SelectedNode.BeginEdit() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strErrorAddFolderFailed, ex.Message), True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strErrorAddFolderFailed, ex.Message), True) End Try End Sub @@ -1077,7 +1077,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "DisconnectConnection (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "DisconnectConnection (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1092,7 +1092,7 @@ Namespace UI Windows.sshtransferForm.Password = conI.Password Windows.sshtransferForm.Port = conI.Port Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SSHTransferFile (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1105,7 +1105,7 @@ Namespace UI Windows.saveasForm.Show(frmMain.pnlDock) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ExportXml (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ExportXml (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1115,7 +1115,7 @@ Namespace UI App.Runtime.ImportConnections() End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ImportXML (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ImportXML (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1125,7 +1125,7 @@ Namespace UI Windows.Show(Type.ADImport) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ImportFromAD (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ImportFromAD (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1133,7 +1133,7 @@ Namespace UI Try App.Runtime.ImportConnectionsFromRDPFiles() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ImportFromRDPFiles (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ImportFromRDPFiles (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1143,7 +1143,7 @@ Namespace UI Windows.Show(Type.PortScan, Tools.PortScan.PortScanMode.Import) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "ImportFromPortScan (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "ImportFromPortScan (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1153,7 +1153,7 @@ Namespace UI cMenTreeToolsExternalApps.DropDownItems.Clear() 'add ext apps - For Each extA As Tools.ExternalApp In ExtApps + For Each extA As Tools.ExternalApp In ExternalTools Dim nItem As New ToolStripMenuItem nItem.Text = extA.DisplayName nItem.Tag = extA @@ -1165,7 +1165,7 @@ Namespace UI cMenTreeToolsExternalApps.DropDownItems.Add(nItem) Next Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeTools_DropDownOpening failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) End Try End Sub @@ -1175,7 +1175,7 @@ Namespace UI 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) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeToolsExternalAppsEntry_Click failed (UI.Window.Tree)" & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -1205,7 +1205,7 @@ Namespace UI Me.tvConnections_KeyDown(sender, e) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "txtSearch_KeyDown (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "txtSearch_KeyDown (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1222,7 +1222,7 @@ Namespace UI Me.txtSearch.SelectionStart = Me.txtSearch.TextLength End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyPress (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyPress (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub @@ -1244,7 +1244,7 @@ Namespace UI Me.txtSearch.SelectionStart = Me.txtSearch.TextLength End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyDown (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_KeyDown (UI.Window.Tree) failed" & vbNewLine & ex.Message, True) End Try End Sub #End Region diff --git a/mRemoteV1/UI/UI.Window.UltraVNCSC.vb b/mRemoteV1/UI/UI.Window.UltraVNCSC.vb index 3aa40c3a..bca2c5c7 100644 --- a/mRemoteV1/UI/UI.Window.UltraVNCSC.vb +++ b/mRemoteV1/UI/UI.Window.UltraVNCSC.vb @@ -107,7 +107,7 @@ Namespace UI 'vnc.ListenEx(My.Settings.UVNCSCPort) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" & vbNewLine & ex.Message, False) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" & vbNewLine & ex.Message, False) Close() End Try End Sub @@ -118,7 +118,7 @@ Namespace UI 'f = GetType(AxHost).GetField("licenseKey", Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Instance) 'f.SetValue(vnc, "{072169039103041044176252035252117103057101225235137221179204110241121074}") Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetupLicense failed (UI.Window.UltraVNCSC)" & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetupLicense failed (UI.Window.UltraVNCSC)" & vbNewLine & ex.Message, True) End Try End Sub diff --git a/mRemoteV1/UI/UI.Window.Update.vb b/mRemoteV1/UI/UI.Window.Update.vb index a27a40cd..e67e74ee 100644 --- a/mRemoteV1/UI/UI.Window.Update.vb +++ b/mRemoteV1/UI/UI.Window.Update.vb @@ -227,7 +227,7 @@ Namespace UI uT.Start() Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -243,7 +243,7 @@ Namespace UI RaiseEvent UpdateCheckCompleted(False) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckFailed & vbNewLine & ex.Message, True) End Try End Sub @@ -285,7 +285,7 @@ Namespace UI SetAvailableVersionText(uI.Version.ToString) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckCompleteFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckCompleteFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -403,7 +403,7 @@ Namespace UI End If End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region @@ -424,7 +424,7 @@ Namespace UI Process.Start(uD.curUI.UpdateLocation) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateStartFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateStartFailed & vbNewLine & ex.Message) End Try End @@ -432,14 +432,14 @@ Namespace UI Try File.Delete(uD.curUI.UpdateLocation) Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDeleteFailed & vbNewLine & ex.Message) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDeleteFailed & vbNewLine & ex.Message) End Try End If Else - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadFailed) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadFailed) End If Catch ex As Exception - mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadCompleteFailed & vbNewLine & ex.Message, True) + MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadCompleteFailed & vbNewLine & ex.Message, True) End Try End Sub #End Region