From 29dad51ff7dd9595eaa2409ccf66189a26394996 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:28:29 -0500 Subject: [PATCH 01/17] Remove unneccessary Converts --- mRemoteV1/App/Runtime.cs | 58 +++++++++++++++------------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs index f17259b38..6cb4dfb1a 100644 --- a/mRemoteV1/App/Runtime.cs +++ b/mRemoteV1/App/Runtime.cs @@ -173,22 +173,20 @@ namespace mRemoteNG.App try { var tagEnumeration = (IEnumerable)((ToolStripMenuItem)sender).Tag; - if (tagEnumeration != null) + if (tagEnumeration == null) return; + foreach (var obj in tagEnumeration) { - foreach (var obj in tagEnumeration) + var screen1 = obj as Screen; + if (screen1 != null) { - var screen1 = obj as Screen; - if (screen1 != null) - { - screen = screen1; - } - else if (obj is DockContent) - { - panel = (DockContent)obj; - } + screen = screen1; + } + else if (obj is DockContent) + { + panel = (DockContent)obj; } - Screens.SendPanelToScreen(panel, screen); } + Screens.SendPanelToScreen(panel, screen); } catch (Exception ex) { @@ -283,7 +281,7 @@ namespace mRemoteNG.App connectionsLoader.ConnectionFileName = GetStartupConnectionFileName(); } - CreateBackupFile(Convert.ToString(connectionsLoader.ConnectionFileName)); + CreateBackupFile(connectionsLoader.ConnectionFileName); } connectionsLoader.UseDatabase = Settings.Default.UseSQLServer; @@ -334,7 +332,7 @@ namespace mRemoteNG.App if (ex is FileNotFoundException && !withDialog) { MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionsLoader.ConnectionFileName), ex, MessageClass.InformationMsg); - NewConnections(Convert.ToString(connectionsLoader.ConnectionFileName)); + NewConnections(connectionsLoader.ConnectionFileName); return; } @@ -389,18 +387,12 @@ namespace mRemoteNG.App var fileName = GetFileName(baseName); var directoryName = GetDirectoryName(baseName); - if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName)) - { - return; - } + if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName)) return; var searchPattern = string.Format(Settings.Default.BackupFileNameFormat, fileName, "*"); var files = Directory.GetFiles(directoryName, searchPattern); - if (files.Length <= Settings.Default.BackupFileKeepCount) - { - return; - } + if (files.Length <= Settings.Default.BackupFileKeepCount) return; Array.Sort(files); Array.Resize(ref files, files.Length - Settings.Default.BackupFileKeepCount); @@ -416,10 +408,8 @@ namespace mRemoteNG.App var newPath = ConnectionsFileInfo.DefaultConnectionsPath + "\\" + ConnectionsFileInfo.DefaultConnectionsFile; #if !PORTABLE var oldPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\" + Application.ProductName + "\\" + ConnectionsFileInfo.DefaultConnectionsFile; - if (File.Exists(oldPath)) - { - return oldPath; - } + // ReSharper disable once ConvertIfStatementToReturnStatement + if (File.Exists(oldPath)) return oldPath; #endif return newPath; } @@ -465,11 +455,11 @@ namespace mRemoteNG.App if (Settings.Default.UseSQLServer) { connectionsSaver.SaveFormat = ConnectionsSaver.Format.SQL; - connectionsSaver.SQLHost = Convert.ToString(Settings.Default.SQLHost); - connectionsSaver.SQLDatabaseName = Convert.ToString(Settings.Default.SQLDatabaseName); - connectionsSaver.SQLUsername = Convert.ToString(Settings.Default.SQLUser); + connectionsSaver.SQLHost = Settings.Default.SQLHost; + connectionsSaver.SQLDatabaseName = Settings.Default.SQLDatabaseName; + connectionsSaver.SQLUsername = Settings.Default.SQLUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.SQLPass), EncryptionKey); + connectionsSaver.SQLPassword = cryptographyProvider.Decrypt(Settings.Default.SQLPass, EncryptionKey); } connectionsSaver.SaveConnections(); @@ -508,8 +498,7 @@ namespace mRemoteNG.App saveFileDialog.Filter = string.Join("|", fileTypes.ToArray()); - if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK) - return; + if (saveFileDialog.ShowDialog(frmMain.Default) != DialogResult.OK) return; connectionsSave.SaveFormat = ConnectionsSaver.Format.mRXML; connectionsSave.ConnectionFileName = saveFileDialog.FileName; @@ -548,10 +537,7 @@ namespace mRemoteNG.App try { var uri = new Uri("dummyscheme" + Uri.SchemeDelimiter + connectionString); - if (string.IsNullOrEmpty(uri.Host)) - { - return null; - } + if (string.IsNullOrEmpty(uri.Host)) return null; var newConnectionInfo = new ConnectionInfo(); newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance); From fc2662c402b687a74a51c62b9714e0022f9abf16 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:33:04 -0500 Subject: [PATCH 02/17] remove unnecessary convert --- mRemoteV1/Config/Connections/ConnectionsSaver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Connections/ConnectionsSaver.cs b/mRemoteV1/Config/Connections/ConnectionsSaver.cs index 0059ca1b4..9611160fc 100644 --- a/mRemoteV1/Config/Connections/ConnectionsSaver.cs +++ b/mRemoteV1/Config/Connections/ConnectionsSaver.cs @@ -187,7 +187,7 @@ namespace mRemoteNG.Config.Connections { if (rootTreeNode.Password) { - _password = Convert.ToString(rootTreeNode.PasswordString).ConvertToSecureString(); + _password = rootTreeNode.PasswordString.ConvertToSecureString(); strProtected = cryptographyProvider.Encrypt("ThisIsProtected", _password); } else From c750e0a64efb006010a4b50e2958f90190ccf787 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:34:32 -0500 Subject: [PATCH 03/17] remove unecessary convert --- mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs b/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs index 402a32016..a365e916f 100644 --- a/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs +++ b/mRemoteV1/Config/Putty/PuttySessionsRegistryProvider.cs @@ -93,7 +93,7 @@ namespace mRemoteNG.Config.Putty try { var currentUserSid = WindowsIdentity.GetCurrent().User?.Value; - var key = Convert.ToString(string.Join("\\", currentUserSid, PuttySessionsKey).Replace("\\", "\\\\")); + var key = string.Join("\\", currentUserSid, PuttySessionsKey).Replace("\\", "\\\\"); var query = new WqlEventQuery($"SELECT * FROM RegistryTreeChangeEvent WHERE Hive = \'HKEY_USERS\' AND RootPath = \'{key}\'"); _eventWatcher = new ManagementEventWatcher(query); _eventWatcher.EventArrived += OnManagementEventArrived; From 3e3029461b368536754aedd316952b03297cdb6e Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:35:51 -0500 Subject: [PATCH 04/17] remove unnecesary convert --- mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs b/mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs index 5801a57bf..b969ef488 100644 --- a/mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs +++ b/mRemoteV1/Config/Putty/PuttySessionsXmingProvider.cs @@ -168,7 +168,7 @@ namespace mRemoteNG.Config.Putty #region Private Methods private static string GetPuttyConfPath() { - var puttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? Convert.ToString(mRemoteNG.Settings.Default.CustomPuttyPath) : App.Info.GeneralAppInfo.PuttyPath; + var puttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : App.Info.GeneralAppInfo.PuttyPath; return Path.Combine(puttyPath, "putty.conf"); } From bf865cbe5df20454872edcb1c3b48c56b10fe5d6 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:38:38 -0500 Subject: [PATCH 05/17] remove unecessary convert --- .../Serializers/RemoteDesktopConnectionManagerDeserializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs index 0c93373d1..8feec2e0c 100644 --- a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -176,7 +176,7 @@ namespace mRemoteNG.Config.Serializers var remoteDesktopNode = xmlNode.SelectSingleNode("./remoteDesktop"); if (remoteDesktopNode?.Attributes?["inherit"].Value == "None") { - var resolutionString = Convert.ToString(remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", "")); + var resolutionString = remoteDesktopNode.SelectSingleNode("./size")?.InnerText.Replace(" ", ""); try { connectionInfo.Resolution = (ProtocolRDP.RDPResolutions)Enum.Parse(typeof(ProtocolRDP.RDPResolutions), "Res" + resolutionString); From 168c77eac5bc963091a59106b96128815acc111d Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:40:46 -0500 Subject: [PATCH 06/17] remove unnecessary parens --- .../Serializers/RemoteDesktopConnectionManagerDeserializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs index 8feec2e0c..f587bb127 100644 --- a/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteV1/Config/Serializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -47,7 +47,7 @@ namespace mRemoteNG.Config.Serializers var schemaVersion = Convert.ToInt32(rdcManNode?.Attributes?["schemaVersion"].Value); if (schemaVersion != 1) { - throw (new FileFormatException($"Unsupported schema version ({schemaVersion}).")); + throw new FileFormatException($"Unsupported schema version ({schemaVersion})."); } } From 5fd403cf0895c175fa9f685f2e798d69d3161fc6 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:42:26 -0500 Subject: [PATCH 07/17] remove unecessary convert --- mRemoteV1/Config/Settings/ExternalAppsLoader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Settings/ExternalAppsLoader.cs b/mRemoteV1/Config/Settings/ExternalAppsLoader.cs index e06cee360..4f6cb542f 100644 --- a/mRemoteV1/Config/Settings/ExternalAppsLoader.cs +++ b/mRemoteV1/Config/Settings/ExternalAppsLoader.cs @@ -73,7 +73,7 @@ namespace mRemoteNG.Config.Settings Runtime.ExternalTools.Add(extA); } - _MainForm.SwitchToolBarText(Convert.ToBoolean(mRemoteNG.Settings.Default.ExtAppsTBShowText)); + _MainForm.SwitchToolBarText(mRemoteNG.Settings.Default.ExtAppsTBShowText); frmMain.Default.AddExternalToolsToToolBar(); } From bb8009363d480e147014d9504fa0dc3cb55715ec Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:45:17 -0500 Subject: [PATCH 08/17] remove unnecessary converts --- mRemoteV1/Config/Settings/SettingsLoader.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mRemoteV1/Config/Settings/SettingsLoader.cs b/mRemoteV1/Config/Settings/SettingsLoader.cs index 89f6741b0..f0acbfccd 100644 --- a/mRemoteV1/Config/Settings/SettingsLoader.cs +++ b/mRemoteV1/Config/Settings/SettingsLoader.cs @@ -131,7 +131,7 @@ namespace mRemoteNG.Config.Settings private void SetAutoSave() { if (mRemoteNG.Settings.Default.AutoSaveEveryMinutes <= 0) return; - MainForm.tmrAutoSave.Interval = Convert.ToInt32(mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000); + MainForm.tmrAutoSave.Interval = mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000; MainForm.tmrAutoSave.Enabled = true; } @@ -150,7 +150,7 @@ namespace mRemoteNG.Config.Settings private static void SetPuttyPath() { - PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? Convert.ToString(mRemoteNG.Settings.Default.CustomPuttyPath) : GeneralAppInfo.PuttyPath; + PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath; } private static void EnsureSettingsAreSavedInNewestVersion() @@ -200,14 +200,14 @@ namespace mRemoteNG.Config.Settings private void AddStaticPanels() { - ToolStripPanelFromString(Convert.ToString(mRemoteNG.Settings.Default.QuickyTBParentDock)).Join(MainForm.tsQuickConnect, mRemoteNG.Settings.Default.QuickyTBLocation); - MainForm.tsQuickConnect.Visible = Convert.ToBoolean(mRemoteNG.Settings.Default.QuickyTBVisible); + ToolStripPanelFromString(mRemoteNG.Settings.Default.QuickyTBParentDock).Join(MainForm.tsQuickConnect, mRemoteNG.Settings.Default.QuickyTBLocation); + MainForm.tsQuickConnect.Visible = mRemoteNG.Settings.Default.QuickyTBVisible; } private void AddDynamicPanels() { - ToolStripPanelFromString(Convert.ToString(mRemoteNG.Settings.Default.ExtAppsTBParentDock)).Join(MainForm.tsExternalTools, mRemoteNG.Settings.Default.ExtAppsTBLocation); - MainForm.tsExternalTools.Visible = Convert.ToBoolean(mRemoteNG.Settings.Default.ExtAppsTBVisible); + ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock).Join(MainForm.tsExternalTools, mRemoteNG.Settings.Default.ExtAppsTBLocation); + MainForm.tsExternalTools.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible; } private ToolStripPanel ToolStripPanelFromString(string Panel) From aaef3dc19c5614b605a76d9d49c045ff5add8ecf Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:45:58 -0500 Subject: [PATCH 09/17] remove unecessary convert --- mRemoteV1/Config/Settings/SettingsSaver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Settings/SettingsSaver.cs b/mRemoteV1/Config/Settings/SettingsSaver.cs index 53ebaa708..6861099c2 100644 --- a/mRemoteV1/Config/Settings/SettingsSaver.cs +++ b/mRemoteV1/Config/Settings/SettingsSaver.cs @@ -63,7 +63,7 @@ namespace mRemoteNG.Config.Settings var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); mRemoteNG.Settings.Default.ConDefaultPassword = - cryptographyProvider.Encrypt(Convert.ToString(mRemoteNG.Settings.Default.ConDefaultPassword), EncryptionKey); + cryptographyProvider.Encrypt(mRemoteNG.Settings.Default.ConDefaultPassword, EncryptionKey); mRemoteNG.Settings.Default.Save(); From 01db774e05706299c0fd52d725798fa4c61ba941 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:48:37 -0500 Subject: [PATCH 10/17] remove unecessary convert & code clean up --- .../Http/Connection.Protocol.HTTPBase.cs | 127 +++++++++--------- 1 file changed, 60 insertions(+), 67 deletions(-) diff --git a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs index f66f94445..78362d5ab 100644 --- a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs +++ b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs @@ -53,7 +53,7 @@ namespace mRemoteNG.Connection.Protocol.Http try { - TabPage objTabPage = InterfaceControl.Parent as TabPage; + var objTabPage = InterfaceControl.Parent as TabPage; if (objTabPage != null) tabTitle = objTabPage.Title; } catch (Exception) @@ -67,7 +67,7 @@ namespace mRemoteNG.Connection.Protocol.Http if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko) { - GeckoWebBrowser GeckoBrowser = (GeckoWebBrowser) wBrowser; + var GeckoBrowser = (GeckoWebBrowser) wBrowser; if (GeckoBrowser != null) { GeckoBrowser.DocumentTitleChanged += geckoBrowser_DocumentTitleChanged; @@ -76,7 +76,7 @@ namespace mRemoteNG.Connection.Protocol.Http } else { - WebBrowser objWebBrowser = (WebBrowser)wBrowser; + var objWebBrowser = (WebBrowser)wBrowser; //SHDocVw.WebBrowserClass objAxWebBrowser = (SHDocVw.WebBrowserClass)objWebBrowser.ActiveXInstance; objWebBrowser.ScrollBarsEnabled = true; @@ -102,7 +102,7 @@ namespace mRemoteNG.Connection.Protocol.Http { try { - string strHost = Convert.ToString(InterfaceControl.Info.Hostname); + var strHost = InterfaceControl.Info.Hostname; /* * Commenting out since this codes doesn't actually do anything at this time... * Possibly related to MR-221 and/or MR-533 ???? @@ -169,11 +169,8 @@ namespace mRemoteNG.Connection.Protocol.Http #region Events private void wBrowser_Navigated(object sender, WebBrowserNavigatedEventArgs e) { - WebBrowser objWebBrowser = wBrowser as WebBrowser; - if (objWebBrowser == null) - { - return; - } + var objWebBrowser = wBrowser as WebBrowser; + if (objWebBrowser == null) return; // This can only be set once the WebBrowser control is shown, it will throw a COM exception otherwise. objWebBrowser.AllowWebBrowserDrop = false; @@ -205,42 +202,40 @@ namespace mRemoteNG.Connection.Protocol.Http { var tabP = InterfaceControl.Parent as TabPage; - if (tabP != null) - { - string shortTitle; + if (tabP == null) return; + string shortTitle; - if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko) - { - if (((GeckoWebBrowser) wBrowser).DocumentTitle.Length >= 15) - { - shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; - } - else - { - shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle; - } - } - else - { - if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15) - { - shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; - } - else - { - shortTitle = ((WebBrowser) wBrowser).DocumentTitle; - } - } + if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko) + { + if (((GeckoWebBrowser) wBrowser).DocumentTitle.Length >= 15) + { + shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; + } + else + { + shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle; + } + } + else + { + if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15) + { + shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; + } + else + { + shortTitle = ((WebBrowser) wBrowser).DocumentTitle; + } + } - if (!string.IsNullOrEmpty(tabTitle)) - { - tabP.Title = tabTitle + @" - " + shortTitle; - } - else - { - tabP.Title = shortTitle; - } - } + if (!string.IsNullOrEmpty(tabTitle)) + { + tabP.Title = tabTitle + @" - " + shortTitle; + } + else + { + tabP.Title = shortTitle; + } } catch (Exception ex) { @@ -255,42 +250,40 @@ namespace mRemoteNG.Connection.Protocol.Http { var tabP = InterfaceControl.Parent as TabPage; - if (tabP != null) + if (tabP == null) return; + string shortTitle; + + if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko) { - string shortTitle; - - if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko) + if (((GeckoWebBrowser)wBrowser).DocumentTitle.Length >= 15) { - if (((GeckoWebBrowser)wBrowser).DocumentTitle.Length >= 15) - { - shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; - } - else - { - shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle; - } + shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; } else { - if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15) - { - shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; - } - else - { - shortTitle = ((WebBrowser) wBrowser).DocumentTitle; - } + shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle; } - - if (!string.IsNullOrEmpty(tabTitle)) + } + else + { + if (((WebBrowser) wBrowser).DocumentTitle.Length >= 15) { - tabP.Title = tabTitle + @" - " + shortTitle; + shortTitle = ((WebBrowser) wBrowser).DocumentTitle.Substring(0, 10) + "..."; } else { - tabP.Title = shortTitle; + shortTitle = ((WebBrowser) wBrowser).DocumentTitle; } } + + if (!string.IsNullOrEmpty(tabTitle)) + { + tabP.Title = tabTitle + @" - " + shortTitle; + } + else + { + tabP.Title = shortTitle; + } } catch (Exception ex) { From 6dc432e6a95791646fb2d22b270f9b1d7755062f Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:51:24 -0500 Subject: [PATCH 11/17] remove unecessary converts and code clean up --- mRemoteV1/Connection/Protocol/PuttyBase.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mRemoteV1/Connection/Protocol/PuttyBase.cs b/mRemoteV1/Connection/Protocol/PuttyBase.cs index bb5afa516..5a633b0e1 100644 --- a/mRemoteV1/Connection/Protocol/PuttyBase.cs +++ b/mRemoteV1/Connection/Protocol/PuttyBase.cs @@ -80,7 +80,7 @@ namespace mRemoteNG.Connection.Protocol } else if (Settings.Default.EmptyCredentials == "custom") { - username = Convert.ToString(Settings.Default.DefaultUsername); + username = Settings.Default.DefaultUsername; } } @@ -93,7 +93,7 @@ namespace mRemoteNG.Connection.Protocol if (Settings.Default.EmptyCredentials == "custom") { var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - password = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey); + password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey); } } @@ -127,10 +127,10 @@ namespace mRemoteNG.Connection.Protocol PuttyProcess.Exited += ProcessExited; PuttyProcess.Start(); - PuttyProcess.WaitForInputIdle(Convert.ToInt32(Settings.Default.MaxPuttyWaitTime * 1000)); + PuttyProcess.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000); var startTicks = Environment.TickCount; - while (PuttyHandle.ToInt32() == 0 & Environment.TickCount < startTicks + (Settings.Default.MaxPuttyWaitTime * 1000)) + while (PuttyHandle.ToInt32() == 0 & Environment.TickCount < startTicks + Settings.Default.MaxPuttyWaitTime * 1000) { if (_isPuttyNg) { @@ -193,7 +193,7 @@ namespace mRemoteNG.Connection.Protocol { return; } - NativeMethods.MoveWindow(PuttyHandle, Convert.ToInt32(-SystemInformation.FrameBorderSize.Width), Convert.ToInt32(-(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height)), InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), true); + NativeMethods.MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), InterfaceControl.Width + SystemInformation.FrameBorderSize.Width * 2, InterfaceControl.Height + SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height * 2, true); } catch (Exception ex) { From 0186254f7429408f36a99a706d54b9f79c40251a Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:56:22 -0500 Subject: [PATCH 12/17] remove unecessary converts --- .../Connection/Protocol/RDP/Connection.Protocol.RDP.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs index 72e3c1a6b..a1dd32fcf 100644 --- a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs +++ b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs @@ -434,7 +434,7 @@ namespace mRemoteNG.Connection.Protocol.RDP } else if (Settings.Default.EmptyCredentials == "custom") { - _rdpClient.UserName = Convert.ToString(Settings.Default.DefaultUsername); + _rdpClient.UserName = Settings.Default.DefaultUsername; } } else @@ -449,7 +449,7 @@ namespace mRemoteNG.Connection.Protocol.RDP if (Settings.Default.DefaultPassword != "") { var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey); + _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey); } } } @@ -466,7 +466,7 @@ namespace mRemoteNG.Connection.Protocol.RDP } else if (Settings.Default.EmptyCredentials == "custom") { - _rdpClient.Domain = Convert.ToString(Settings.Default.DefaultDomain); + _rdpClient.Domain = Settings.Default.DefaultDomain; } } else From 9a3f1bd5cf4d217967429dc6fb473309c9d23bb7 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 20:58:43 -0500 Subject: [PATCH 13/17] remove unecessary convert --- mRemoteV1/UI/Forms/frmMain.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs index 8c3471f10..9bf00f466 100644 --- a/mRemoteV1/UI/Forms/frmMain.cs +++ b/mRemoteV1/UI/Forms/frmMain.cs @@ -655,7 +655,7 @@ namespace mRemoteNG.UI.Forms for (var i = 0; i <= Runtime.WindowList.Count - 1; i++) { - var tItem = new ToolStripMenuItem(Convert.ToString(Runtime.WindowList[i].Text), + var tItem = new ToolStripMenuItem(Runtime.WindowList[i].Text, Runtime.WindowList[i].Icon.ToBitmap(), ConnectionPanelMenuItem_Click) {Tag = Runtime.WindowList[i]}; mMenViewConnectionPanels.DropDownItems.Add(tItem); } From 3f9ca1454ee5f904b4f05fabccf8397789280ca7 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 21:02:19 -0500 Subject: [PATCH 14/17] removed unnecessary converts and code clean up --- .../UI/Forms/OptionsPages/ConnectionsPage.cs | 64 +++++++++---------- 1 file changed, 31 insertions(+), 33 deletions(-) diff --git a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs index babb70ae1..b865c63d4 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs @@ -52,11 +52,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages { base.SaveSettings(); - chkSingleClickOnConnectionOpensIt.Checked = - Convert.ToBoolean(Settings.Default.SingleClickOnConnectionOpensIt); - chkSingleClickOnOpenedConnectionSwitchesToIt.Checked = - Convert.ToBoolean(Settings.Default.SingleClickSwitchesToOpenConnection); - chkHostnameLikeDisplayName.Checked = Convert.ToBoolean(Settings.Default.SetHostnameLikeDisplayName); + chkSingleClickOnConnectionOpensIt.Checked = Settings.Default.SingleClickOnConnectionOpensIt; + chkSingleClickOnOpenedConnectionSwitchesToIt.Checked = Settings.Default.SingleClickSwitchesToOpenConnection; + chkHostnameLikeDisplayName.Checked = Settings.Default.SetHostnameLikeDisplayName; numRdpReconnectionCount.Value = Convert.ToDecimal(Settings.Default.RdpReconnectionCount); @@ -65,39 +63,39 @@ namespace mRemoteNG.UI.Forms.OptionsPages numAutoSave.Value = Convert.ToDecimal(Settings.Default.AutoSaveEveryMinutes); // ReSharper disable once StringLiteralTypo - if (Settings.Default.EmptyCredentials == "noinfo") + // ReSharper disable once SwitchStatementMissingSomeCases + switch (Settings.Default.EmptyCredentials) { - radCredentialsNoInfo.Checked = true; - } - else if (Settings.Default.EmptyCredentials == "windows") - { - radCredentialsWindows.Checked = true; - } - else if (Settings.Default.EmptyCredentials == "custom") - { - radCredentialsCustom.Checked = true; + case "noinfo": + radCredentialsNoInfo.Checked = true; + break; + case "windows": + radCredentialsWindows.Checked = true; + break; + case "custom": + radCredentialsCustom.Checked = true; + break; } - txtCredentialsUsername.Text = Convert.ToString(Settings.Default.DefaultUsername); + txtCredentialsUsername.Text = Settings.Default.DefaultUsername; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - txtCredentialsPassword.Text = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.DefaultPassword), Runtime.EncryptionKey); - txtCredentialsDomain.Text = Convert.ToString(Settings.Default.DefaultDomain); + txtCredentialsPassword.Text = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey); + txtCredentialsDomain.Text = Settings.Default.DefaultDomain; - if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Never) + switch (Settings.Default.ConfirmCloseConnection) { - radCloseWarnNever.Checked = true; - } - else if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Exit) - { - radCloseWarnExit.Checked = true; - } - else if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Multiple) - { - radCloseWarnMultiple.Checked = true; - } - else - { - radCloseWarnAll.Checked = true; + case (int) ConfirmCloseEnum.Never: + radCloseWarnNever.Checked = true; + break; + case (int) ConfirmCloseEnum.Exit: + radCloseWarnExit.Checked = true; + break; + case (int) ConfirmCloseEnum.Multiple: + radCloseWarnMultiple.Checked = true; + break; + default: + radCloseWarnAll.Checked = true; + break; } } @@ -114,7 +112,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages Settings.Default.AutoSaveEveryMinutes = (int) numAutoSave.Value; if (Settings.Default.AutoSaveEveryMinutes > 0) { - frmMain.Default.tmrAutoSave.Interval = Convert.ToInt32(Settings.Default.AutoSaveEveryMinutes*60000); + frmMain.Default.tmrAutoSave.Interval = Settings.Default.AutoSaveEveryMinutes*60000; frmMain.Default.tmrAutoSave.Enabled = true; } else From 88178a6b6b80c8f6250ed0bf29d46d96e7b86545 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 21:04:20 -0500 Subject: [PATCH 15/17] remove unnecessary converts --- .../UI/Forms/OptionsPages/UpdatesPage.cs | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs index 2ea1fea1e..58babe206 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs @@ -55,7 +55,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { base.SaveSettings(); - chkCheckForUpdatesOnStartup.Checked = Convert.ToBoolean(Settings.Default.CheckForUpdatesOnStartup); + chkCheckForUpdatesOnStartup.Checked = Settings.Default.CheckForUpdatesOnStartup; cboUpdateCheckFrequency.Enabled = chkCheckForUpdatesOnStartup.Checked; cboUpdateCheckFrequency.Items.Clear(); var nDaily = cboUpdateCheckFrequency.Items.Add(Language.strUpdateFrequencyDaily); @@ -104,18 +104,18 @@ namespace mRemoteNG.UI.Forms.OptionsPages break; } - chkUseProxyForAutomaticUpdates.Checked = Convert.ToBoolean(Settings.Default.UpdateUseProxy); - pnlProxyBasic.Enabled = Convert.ToBoolean(Settings.Default.UpdateUseProxy); - txtProxyAddress.Text = Convert.ToString(Settings.Default.UpdateProxyAddress); + chkUseProxyForAutomaticUpdates.Checked = Settings.Default.UpdateUseProxy; + pnlProxyBasic.Enabled = Settings.Default.UpdateUseProxy; + txtProxyAddress.Text = Settings.Default.UpdateProxyAddress; numProxyPort.Value = Convert.ToDecimal(Settings.Default.UpdateProxyPort); - chkUseProxyAuthentication.Checked = Convert.ToBoolean(Settings.Default.UpdateProxyUseAuthentication); - pnlProxyAuthentication.Enabled = Convert.ToBoolean(Settings.Default.UpdateProxyUseAuthentication); - txtProxyUsername.Text = Convert.ToString(Settings.Default.UpdateProxyAuthUser); + chkUseProxyAuthentication.Checked = Settings.Default.UpdateProxyUseAuthentication; + pnlProxyAuthentication.Enabled = Settings.Default.UpdateProxyUseAuthentication; + txtProxyUsername.Text = Settings.Default.UpdateProxyAuthUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - txtProxyPassword.Text = cryptographyProvider.Decrypt(Convert.ToString(Settings.Default.UpdateProxyAuthPass), Runtime.EncryptionKey); + txtProxyPassword.Text = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey); - btnTestProxy.Enabled = Convert.ToBoolean(Settings.Default.UpdateUseProxy); + btnTestProxy.Enabled = Settings.Default.UpdateUseProxy; } public override void SaveSettings() @@ -246,12 +246,11 @@ namespace mRemoteNG.UI.Forms.OptionsPages throw e.Error; } - CTaskDialog.ShowCommandBox(this, Convert.ToString(Application.ProductName), - Language.strProxyTestSucceeded, "", Language.strButtonOK, false); + CTaskDialog.ShowCommandBox(this, Application.ProductName, Language.strProxyTestSucceeded, "", Language.strButtonOK, false); } catch (Exception ex) { - CTaskDialog.ShowCommandBox(this, Convert.ToString(Application.ProductName), Language.strProxyTestFailed, + CTaskDialog.ShowCommandBox(this, Application.ProductName, Language.strProxyTestFailed, MiscTools.GetExceptionMessageRecursive(ex), "", "", "", Language.strButtonOK, false, ESysIcons.Error, 0); } From 7f65bfeebb4dddb474c422a89d24036ec0e57666 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 21:05:33 -0500 Subject: [PATCH 16/17] remove unecessary converts --- mRemoteV1/UI/Window/ComponentsCheckWindow.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs index 840ec7725..ed27a0c62 100644 --- a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs +++ b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs @@ -406,7 +406,7 @@ namespace mRemoteNG.UI.Window private void ComponentsCheck_Load(object sender, EventArgs e) { ApplyLanguage(); - chkAlwaysShow.Checked = Convert.ToBoolean(Settings.Default.StartupComponentsCheck); + chkAlwaysShow.Checked = Settings.Default.StartupComponentsCheck; CheckComponents(); } @@ -470,7 +470,7 @@ namespace mRemoteNG.UI.Window System.Windows.Forms.Application.DoEvents(); } - if (!(new Version(Convert.ToString(rdpClient.Version)) >= ProtocolRDP.Versions.RDC80)) + if (!(new Version(rdpClient.Version) >= ProtocolRDP.Versions.RDC80)) { throw new Exception( $"Found RDC Client version {rdpClient.Version} but version {ProtocolRDP.Versions.RDC80} or higher is required."); @@ -541,7 +541,7 @@ namespace mRemoteNG.UI.Window } else { - pPath = Convert.ToString(Settings.Default.CustomPuttyPath); + pPath = Settings.Default.CustomPuttyPath; } if (File.Exists(pPath)) From 42774a622734a23e52c272dd12aaff9dccc8874d Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 24 Jan 2017 21:07:25 -0500 Subject: [PATCH 17/17] code cleanup --- mRemoteV1/UI/Window/HelpWindow.cs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mRemoteV1/UI/Window/HelpWindow.cs b/mRemoteV1/UI/Window/HelpWindow.cs index 72ad8fdae..acd684223 100644 --- a/mRemoteV1/UI/Window/HelpWindow.cs +++ b/mRemoteV1/UI/Window/HelpWindow.cs @@ -28,7 +28,7 @@ namespace mRemoteNG.UI.Window TreeNode TreeNode4 = new TreeNode("Configuration"); TreeNode TreeNode5 = new TreeNode("SQL Configuration"); TreeNode TreeNode6 = new TreeNode("Command-Line Switches"); - TreeNode TreeNode7 = new TreeNode("Getting Started", new TreeNode[] {TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}); + TreeNode TreeNode7 = new TreeNode("Getting Started", new[] {TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}); TreeNode TreeNode8 = new TreeNode("Main Menu"); TreeNode TreeNode9 = new TreeNode("Connections"); TreeNode TreeNode10 = new TreeNode("Config"); @@ -43,9 +43,9 @@ namespace mRemoteNG.UI.Window TreeNode TreeNode20 = new TreeNode("Import From Active Directory"); TreeNode TreeNode21 = new TreeNode("External Applications"); TreeNode TreeNode22 = new TreeNode("Port Scan"); - TreeNode TreeNode23 = new TreeNode("User Interface", new TreeNode[] {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22}); + TreeNode TreeNode23 = new TreeNode("User Interface", new[] {TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12, TreeNode14, TreeNode15, TreeNode16, TreeNode17, TreeNode18, TreeNode19, TreeNode20, TreeNode21, TreeNode22}); TreeNode TreeNode24 = new TreeNode("Quick Reference"); - TreeNode TreeNode25 = new TreeNode("Help", new TreeNode[] {TreeNode1, TreeNode7, TreeNode23, TreeNode24}); + TreeNode TreeNode25 = new TreeNode("Help", new[] {TreeNode1, TreeNode7, TreeNode23, TreeNode24}); wbHelp = new WebBrowser(); wbHelp.DocumentTitleChanged += new EventHandler(wbHelp_DocumentTitleChanged); tvIndex = new TreeView(); @@ -61,8 +61,8 @@ namespace mRemoteNG.UI.Window // //wbHelp // - wbHelp.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom) - | AnchorStyles.Left) + wbHelp.Anchor = AnchorStyles.Top | AnchorStyles.Bottom + | AnchorStyles.Left | AnchorStyles.Right; wbHelp.Location = new System.Drawing.Point(1, 36); wbHelp.MinimumSize = new System.Drawing.Size(20, 20); @@ -73,8 +73,8 @@ namespace mRemoteNG.UI.Window // //tvIndex // - tvIndex.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom) - | AnchorStyles.Left) + tvIndex.Anchor = AnchorStyles.Top | AnchorStyles.Bottom + | AnchorStyles.Left | AnchorStyles.Right; tvIndex.BorderStyle = BorderStyle.None; tvIndex.HideSelection = false; @@ -150,7 +150,7 @@ namespace mRemoteNG.UI.Window TreeNode25.Name = "Node0"; TreeNode25.Text = "Help"; TreeNode25.Tag = "Index"; - tvIndex.Nodes.AddRange(new TreeNode[] {TreeNode25}); + tvIndex.Nodes.AddRange(new[] {TreeNode25}); tvIndex.ShowRootLines = false; tvIndex.Size = new System.Drawing.Size(207, 321); tvIndex.TabIndex = 0; @@ -163,8 +163,8 @@ namespace mRemoteNG.UI.Window // //pnlSplitter // - pnlSplitter.Anchor = ((AnchorStyles.Top | AnchorStyles.Bottom) - | AnchorStyles.Left) + pnlSplitter.Anchor = AnchorStyles.Top | AnchorStyles.Bottom + | AnchorStyles.Left | AnchorStyles.Right; pnlSplitter.FixedPanel = FixedPanel.Panel1; pnlSplitter.Location = new System.Drawing.Point(0, 0); @@ -184,7 +184,7 @@ namespace mRemoteNG.UI.Window // //lblDocName // - lblDocName.Anchor = (AnchorStyles.Top | AnchorStyles.Left) + lblDocName.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; lblDocName.BackColor = System.Drawing.Color.DimGray; lblDocName.Font = new System.Drawing.Font("Segoe UI", 12.0F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, Convert.ToByte(0)); @@ -243,9 +243,9 @@ namespace mRemoteNG.UI.Window tvIndex.SelectedNode = e.Node; } - private void tvIndex_AfterSelect(Object sender, TreeViewEventArgs e) + private void tvIndex_AfterSelect(object sender, TreeViewEventArgs e) { - if (((string)e.Node.Tag) != "" && e.Node.Tag != null) + if ((string)e.Node.Tag != "" && e.Node.Tag != null) { wbHelp.Navigate(GeneralAppInfo.HomePath + "\\Help\\" + Convert.ToString(e.Node.Tag) +".htm"); }