From 27f8f2542e96dbcd9e07c9ac1607a2d91e281479 Mon Sep 17 00:00:00 2001 From: Tony M Lambert Date: Fri, 2 Dec 2016 15:25:05 -0600 Subject: [PATCH 01/10] Added screenshots for Quickconnect documentation --- .../Help/Screenshots/Quickconnect/01.png | Bin 0 -> 2300 bytes .../Help/Screenshots/Quickconnect/02.png | Bin 0 -> 4232 bytes .../Help/Screenshots/Quickconnect/03.png | Bin 0 -> 3924 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mRemoteV1/Resources/Help/Screenshots/Quickconnect/01.png create mode 100644 mRemoteV1/Resources/Help/Screenshots/Quickconnect/02.png create mode 100644 mRemoteV1/Resources/Help/Screenshots/Quickconnect/03.png diff --git a/mRemoteV1/Resources/Help/Screenshots/Quickconnect/01.png b/mRemoteV1/Resources/Help/Screenshots/Quickconnect/01.png new file mode 100644 index 0000000000000000000000000000000000000000..3fa15b94dbfc2e867c4113cf3a18100d910f6e2d GIT binary patch literal 2300 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
jX6DP-$;{!z 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 SKbfE2L;5;~+9jIz!v6&u&wncb literal 0 HcmV?d00001 From 3dbcbae61f0ef82102f3b23a369d39ec2e8bef1b Mon Sep 17 00:00:00 2001 From: Tony M Lambert Date: Fri, 2 Dec 2016 15:49:04 -0600 Subject: [PATCH 02/10] Added code for Quick Connect documentation Added HTML code to document Quick Connect functionality --- mRemoteV1/Resources/Help/QuickConnect.htm | 71 +++++++++++++++++++---- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/mRemoteV1/Resources/Help/QuickConnect.htm b/mRemoteV1/Resources/Help/QuickConnect.htm index 943e82e9a..3a76ebc8b 100644 --- a/mRemoteV1/Resources/Help/QuickConnect.htm +++ b/mRemoteV1/Resources/Help/QuickConnect.htm @@ -1,13 +1,60 @@ - - - - Quick Connect - - - - -

- Sorry, not yet...

- - + + + + Quick Connect + + + + +

+ The Quick Connect functionality of mRemoteNG allows you to quickly connect to a remote host using a variety of network protocols. +

+ +

+ Use Cases +

+ +

+ The primary use case for Quick Connect is to connect to remote hosts when you already remember the DNS hostname/IP address and the appropriate protocol for the connection. +
+
+ An additional use case is to connect to remote hosts saved as a connection quickly. +

+ +

+ Prerequisites +

+ +
    +
  • Knowledge of a DNS host name or IP address
    • +
  • Knowledge of an appropriate protocol to communicate with remote host
    • +
+

OR

+
    +
  • A predefined mRemoteNG connection
    • +
+ +

+ Using QuickConnect +

+ +

+ To use Quick Connect, ensure the Quick Connect toolbar is enabled by selecting View and then Quick Connect Toolbar. +
+ Next, input a DNS host name or IP address into the box labeled "Connect". This box will also save previous entries during your session. +
+ Quick Connect Toolbar +
+
+ Quick Connect Toolbar +
+
+ Select the appropriate network protocol by clicking the arrow next to the Connect box. +
+ Quick Connect Toolbar +
+
+ If you wish to use an existing connection, select the globe icon next to the protocol button and select the appropriate connection. +

+ \ No newline at end of file From 8966f44272fcb04f247f349a430a74c0ba8dd096 Mon Sep 17 00:00:00 2001 From: David Sparer Date: Fri, 2 Dec 2016 16:49:49 -0700 Subject: [PATCH 03/10] resolved issue with Jenkins not being about the build PRs --- Jenkinsfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 951d1b6d5..689d8f4ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,11 +5,7 @@ node('windows') { def vsExtensionsDir = "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow" stage 'Checkout Branch' - checkout([ - $class: 'GitSCM', - branches: scm.branches, - userRemoteConfigs: scm.userRemoteConfigs - ]) + checkout scm stage 'Restore NuGet Packages' def nugetPath = "C:\\nuget.exe" From f9b18b45a42c52b631b229cd07cc3d7f4b85893c Mon Sep 17 00:00:00 2001 From: David Sparer Date: Sat, 3 Dec 2016 10:46:20 -0700 Subject: [PATCH 04/10] updated the jenkins build badge to point to the sanitized url. added a title to readme.md --- README.MD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.MD b/README.MD index 4d9d7fe00..ecad8f95e 100644 --- a/README.MD +++ b/README.MD @@ -1,11 +1,10 @@ +# Welcome to the mRemoteNG project! + [![Twitter Follow](https://img.shields.io/twitter/follow/mRemoteNG.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=mRemoteNG) - - [![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat) - [![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer) -[![Build Status](http://ec2-52-39-111-114.us-west-2.compute.amazonaws.com:8080/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](http://ec2-52-39-111-114.us-west-2.compute.amazonaws.com:8080/job/mRemoteNG/job/mRemoteNG/job/develop/) +[![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/develop/) [![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG) [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.74/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.74) From f7787c748ae1f7044856db17a5d4d105e52391df Mon Sep 17 00:00:00 2001 From: David Sparer Date: Sat, 3 Dec 2016 11:17:41 -0700 Subject: [PATCH 05/10] Added multiple build badges based on update channel to readme.md --- README.MD | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.MD b/README.MD index ecad8f95e..f2ce96154 100644 --- a/README.MD +++ b/README.MD @@ -4,12 +4,17 @@ [![Join the chat at https://gitter.im/mRemoteNG/PublicChat/](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mRemoteNG/PublicChat) [![PayPal](https://img.shields.io/badge/%24-PayPal-blue.svg)](https://www.paypal.me/DavidSparer) -[![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/develop/) -[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG) -[![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.74/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.74) - [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/529/badge)](https://bestpractices.coreinfrastructure.org/projects/529) +[![Issues In Progress](https://badge.waffle.io/mRemoteNG/mRemoteNG.png?label=In%20Progress&title=In%20Progress)](https://waffle.io/mRemoteNG/mRemoteNG) + +| Update Channel | Build Status | Downloads | +| ---------------|--------------|-----------| +| Stable | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/master)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/master/) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.74/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.74) | +| Beta | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/beta_channel)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/beta_channel/) | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75Beta3/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75Beta3) | +| Development | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/develop/) | - | + + mRemoteNG is the next generation of mRemote, a full-featured, multi-tab remote connections manager. From 002e41f418de2e12558ea2e7b07f7b44b1c1d131 Mon Sep 17 00:00:00 2001 From: ForensicITGuy Date: Tue, 6 Dec 2016 01:04:52 -0600 Subject: [PATCH 06/10] Added Quick Connect screenshots into project. Modified folder name and HTML code to include spaces as observed in the other screenshot folders. Set to track content and copy if newer in output. --- mRemoteV1/Resources/Help/QuickConnect.htm | 6 +++--- .../Help/Screenshots/Quick Connect/01.png | Bin 0 -> 2300 bytes .../Help/Screenshots/Quick Connect/02.png | Bin 0 -> 4232 bytes .../Help/Screenshots/Quick Connect/03.png | Bin 0 -> 3924 bytes mRemoteV1/mRemoteV1.csproj | 9 +++++++++ 5 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 mRemoteV1/Resources/Help/Screenshots/Quick Connect/01.png create mode 100644 mRemoteV1/Resources/Help/Screenshots/Quick Connect/02.png create mode 100644 mRemoteV1/Resources/Help/Screenshots/Quick Connect/03.png diff --git a/mRemoteV1/Resources/Help/QuickConnect.htm b/mRemoteV1/Resources/Help/QuickConnect.htm index 3a76ebc8b..3f784d495 100644 --- a/mRemoteV1/Resources/Help/QuickConnect.htm +++ b/mRemoteV1/Resources/Help/QuickConnect.htm @@ -43,15 +43,15 @@
Next, input a DNS host name or IP address into the box labeled "Connect". This box will also save previous entries during your session.
- Quick Connect Toolbar + Quick Connect Toolbar

- Quick Connect Toolbar + Quick Connect Toolbar

Select the appropriate network protocol by clicking the arrow next to the Connect box.
- Quick Connect Toolbar + Quick Connect Toolbar

If you wish to use an existing connection, select the globe icon next to the protocol button and select the appropriate connection. diff --git a/mRemoteV1/Resources/Help/Screenshots/Quick Connect/01.png b/mRemoteV1/Resources/Help/Screenshots/Quick Connect/01.png new file mode 100644 index 0000000000000000000000000000000000000000..3fa15b94dbfc2e867c4113cf3a18100d910f6e2d GIT binary patch literal 2300 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
jX6DP-$;{!z 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 SKbfE2L;5;~+9jIz!v6&u&wncb literal 0 HcmV?d00001 diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index 10e50f4ec..d3975c74d 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -762,6 +762,15 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest From e38f7c880e2180a31f14c5498cc92435245bbf9d Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 6 Dec 2016 19:13:09 -0500 Subject: [PATCH 07/10] code clean up Added some log messages for #298 --- mRemoteV1/App/CompatibilityChecker.cs | 35 +++++++------- mRemoteV1/App/Startup.cs | 66 +++++++++++++-------------- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/mRemoteV1/App/CompatibilityChecker.cs b/mRemoteV1/App/CompatibilityChecker.cs index a7e29265c..c69da026d 100644 --- a/mRemoteV1/App/CompatibilityChecker.cs +++ b/mRemoteV1/App/CompatibilityChecker.cs @@ -8,24 +8,23 @@ using System.Windows.Forms; namespace mRemoteNG.App { - public class CompatibilityChecker + public static class CompatibilityChecker { - public void CheckCompatibility() + public static void CheckCompatibility() { CheckFipsPolicy(); CheckLenovoAutoScrollUtility(); } - private void CheckFipsPolicy() + private static void CheckFipsPolicy() { - if (FipsPolicyEnabledForServer2003() || FipsPolicyEnabledForServer2008AndNewer()) - { - MessageBox.Show(frmMain.Default, string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName, GeneralAppInfo.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error)); - Environment.Exit(1); - } + Logger.Instance.InfoFormat("Checking FIPS Policy..."); + if (!FipsPolicyEnabledForServer2003() && !FipsPolicyEnabledForServer2008AndNewer()) return; + MessageBox.Show(frmMain.Default, string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName, GeneralAppInfo.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error)); + Environment.Exit(1); } - private bool FipsPolicyEnabledForServer2003() + private static bool FipsPolicyEnabledForServer2003() { var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa"); var fipsPolicy = regKey?.GetValue("FIPSAlgorithmPolicy"); @@ -34,7 +33,7 @@ namespace mRemoteNG.App return (int)fipsPolicy != 0; } - private bool FipsPolicyEnabledForServer2008AndNewer() + private static bool FipsPolicyEnabledForServer2008AndNewer() { var regKey = Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy"); var fipsPolicy = regKey?.GetValue("Enabled"); @@ -43,12 +42,14 @@ namespace mRemoteNG.App return (int)fipsPolicy != 0; } - private void CheckLenovoAutoScrollUtility() + private static void CheckLenovoAutoScrollUtility() { + Logger.Instance.InfoFormat("Checking Lenovo AutoScroll Utility..."); + if (!Settings.Default.CompatibilityWarnLenovoAutoScrollUtility) return; - Process[] proccesses = new Process[] { }; + var proccesses = new Process[] { }; try { proccesses = Process.GetProcessesByName("virtscrl"); @@ -58,12 +59,10 @@ namespace mRemoteNG.App Runtime.MessageCollector.AddExceptionMessage("Error in CheckLenovoAutoScrollUtility", ex); } - if (proccesses.Length > 0) - { - CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected, Application.ProductName), "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok, ESysIcons.Warning, ESysIcons.Warning); - if (CTaskDialog.VerificationChecked) - Settings.Default.CompatibilityWarnLenovoAutoScrollUtility = false; - } + if (proccesses.Length <= 0) return; + CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected, string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected, Application.ProductName), "", "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok, ESysIcons.Warning, ESysIcons.Warning); + if (CTaskDialog.VerificationChecked) + Settings.Default.CompatibilityWarnLenovoAutoScrollUtility = false; } } } diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs index cd067324a..163669376 100644 --- a/mRemoteV1/App/Startup.cs +++ b/mRemoteV1/App/Startup.cs @@ -22,14 +22,12 @@ namespace mRemoteNG.App { public class Startup { - private CompatibilityChecker _compatibilityChecker; private AppUpdater _appUpdate; public static Startup Instance { get; } = new Startup(); private Startup() { - _compatibilityChecker = new CompatibilityChecker(); _appUpdate = new AppUpdater(); } @@ -41,12 +39,12 @@ namespace mRemoteNG.App { Debug.Print("---------------------------" + Environment.NewLine + "[START] - " + Convert.ToString(DateTime.Now, CultureInfo.InvariantCulture)); LogStartupData(); - _compatibilityChecker.CheckCompatibility(); + CompatibilityChecker.CheckCompatibility(); ParseCommandLineArgs(); IeBrowserEmulation.Register(); GetConnectionIcons(); - DefaultConnectionInfo.Instance.LoadFrom(Settings.Default, (a)=>"ConDefault"+a); - DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, (a)=>"InhDefault"+a); + DefaultConnectionInfo.Instance.LoadFrom(Settings.Default, a=>"ConDefault"+a); + DefaultConnectionInheritance.Instance.LoadFrom(Settings.Default, a=>"InhDefault"+a); } public void SetDefaultLayout() @@ -67,23 +65,23 @@ namespace mRemoteNG.App frmMain.Default.pnlDock.Visible = true; } - private void GetConnectionIcons() + private static void GetConnectionIcons() { - string iPath = GeneralAppInfo.HomePath + "\\Icons\\"; + var iPath = GeneralAppInfo.HomePath + "\\Icons\\"; if (Directory.Exists(iPath) == false) { return; } - foreach (string f in Directory.GetFiles(iPath, "*.ico", SearchOption.AllDirectories)) + foreach (var f in Directory.GetFiles(iPath, "*.ico", SearchOption.AllDirectories)) { - FileInfo fInfo = new FileInfo(f); + var fInfo = new FileInfo(f); Array.Resize(ref ConnectionIcon.Icons, ConnectionIcon.Icons.Length + 1); ConnectionIcon.Icons.SetValue(fInfo.Name.Replace(".ico", ""), ConnectionIcon.Icons.Length - 1); } } - private void LogStartupData() + private static void LogStartupData() { if (!Settings.Default.WriteLogFile) return; LogApplicationData(); @@ -93,17 +91,17 @@ namespace mRemoteNG.App LogCultureData(); } - private void LogSystemData() + private static void LogSystemData() { - string osData = GetOperatingSystemData(); - string architecture = GetArchitectureData(); + var osData = GetOperatingSystemData(); + var architecture = GetArchitectureData(); Logger.Instance.InfoFormat(string.Join(" ", Array.FindAll(new[] { osData, architecture }, s => !string.IsNullOrEmpty(Convert.ToString(s))))); } - private string GetOperatingSystemData() + private static string GetOperatingSystemData() { - string osVersion = string.Empty; - string servicePack = string.Empty; + var osVersion = string.Empty; + var servicePack = string.Empty; try { @@ -118,13 +116,13 @@ namespace mRemoteNG.App { Logger.Instance.WarnFormat($"Error retrieving operating system information from WMI. {ex.Message}"); } - string osData = string.Join(" ", new string[] { osVersion, servicePack }); + var osData = string.Join(" ", new string[] { osVersion, servicePack }); return osData; } - private string GetOSServicePack(string servicePack, ManagementObject managementObject) + private static string GetOSServicePack(string servicePack, ManagementObject managementObject) { - int servicePackNumber = Convert.ToInt32(managementObject.GetPropertyValue("ServicePackMajorVersion")); + var servicePackNumber = Convert.ToInt32(managementObject.GetPropertyValue("ServicePackMajorVersion")); if (servicePackNumber != 0) { servicePack = $"Service Pack {servicePackNumber}"; @@ -132,15 +130,15 @@ namespace mRemoteNG.App return servicePack; } - private string GetArchitectureData() + private static string GetArchitectureData() { - string architecture = string.Empty; + var architecture = string.Empty; try { foreach (var o in new ManagementObjectSearcher("SELECT * FROM Win32_Processor WHERE DeviceID=\'CPU0\'").Get()) { var managementObject = (ManagementObject) o; - int addressWidth = Convert.ToInt32(managementObject.GetPropertyValue("AddressWidth")); + var addressWidth = Convert.ToInt32(managementObject.GetPropertyValue("AddressWidth")); architecture = $"{addressWidth}-bit"; } } @@ -151,7 +149,7 @@ namespace mRemoteNG.App return architecture; } - private void LogApplicationData() + private static void LogApplicationData() { #if !PORTABLE Logger.Instance.InfoFormat($"{Application.ProductName} {Application.ProductVersion} starting."); @@ -161,17 +159,17 @@ namespace mRemoteNG.App #endif } - private void LogCmdLineArgs() + private static void LogCmdLineArgs() { Logger.Instance.InfoFormat($"Command Line: {Environment.GetCommandLineArgs()}"); } - private void LogCLRData() + private static void LogCLRData() { Logger.Instance.InfoFormat($"Microsoft .NET CLR {Environment.Version}"); } - private void LogCultureData() + private static void LogCultureData() { Logger.Instance.InfoFormat( $"System Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}"); @@ -197,7 +195,7 @@ namespace mRemoteNG.App return; } - DateTime nextUpdateCheck = Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Settings.Default.CheckForUpdatesFrequencyDays)))); + var nextUpdateCheck = Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Settings.Default.CheckForUpdatesFrequencyDays)))); if (!Settings.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck) { return; @@ -240,13 +238,13 @@ namespace mRemoteNG.App } - private void ParseCommandLineArgs() + private static void ParseCommandLineArgs() { try { - CmdArgumentsInterpreter cmd = new CmdArgumentsInterpreter(Environment.GetCommandLineArgs()); + var cmd = new CmdArgumentsInterpreter(Environment.GetCommandLineArgs()); - string ConsParam = ""; + var ConsParam = ""; if (cmd["cons"] != null) { ConsParam = "cons"; @@ -256,7 +254,7 @@ namespace mRemoteNG.App ConsParam = "c"; } - string ResetPosParam = ""; + var ResetPosParam = ""; if (cmd["resetpos"] != null) { ResetPosParam = "resetpos"; @@ -266,7 +264,7 @@ namespace mRemoteNG.App ResetPosParam = "rp"; } - string ResetPanelsParam = ""; + var ResetPanelsParam = ""; if (cmd["resetpanels"] != null) { ResetPanelsParam = "resetpanels"; @@ -276,7 +274,7 @@ namespace mRemoteNG.App ResetPanelsParam = "rpnl"; } - string ResetToolbarsParam = ""; + var ResetToolbarsParam = ""; if (cmd["resettoolbar"] != null) { ResetToolbarsParam = "resettoolbar"; @@ -293,7 +291,7 @@ namespace mRemoteNG.App ResetToolbarsParam = "rtbr"; } - string NoReconnectParam = ""; + var NoReconnectParam = ""; if (cmd["noreconnect"] != null) { NoReconnectParam = "noreconnect"; From d4681073115e98b99ea62c91253f2fb69cba9193 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 13 Dec 2016 10:50:36 -0500 Subject: [PATCH 08/10] Load users default/current domain Fixes #311 Caused by 97a0e2413e702e04afbb0c3acf620637e9653a7a Some code clean up as well... --- .../ActiveDirectoryImportWindow.Designer.cs | 4 +- .../UI/Window/ActiveDirectoryImportWindow.cs | 128 ++++++++++-------- 2 files changed, 72 insertions(+), 60 deletions(-) diff --git a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs index 1713a9584..b842e70c6 100644 --- a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs +++ b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs @@ -64,9 +64,9 @@ namespace mRemoteNG.UI.Window | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.ActiveDirectoryTree.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ActiveDirectoryTree.Domain = "tant-a01"; + this.ActiveDirectoryTree.Domain = "DOMAIN"; this.ActiveDirectoryTree.Location = new System.Drawing.Point(12, 52); - this.ActiveDirectoryTree.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.ActiveDirectoryTree.Margin = new System.Windows.Forms.Padding(4); this.ActiveDirectoryTree.Name = "ActiveDirectoryTree"; this.ActiveDirectoryTree.SelectedNode = null; this.ActiveDirectoryTree.Size = new System.Drawing.Size(506, 280); diff --git a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs index f97dc9534..0e1039906 100644 --- a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs +++ b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs @@ -8,81 +8,93 @@ using mRemoteNG.Container; namespace mRemoteNG.UI.Window { - public partial class ActiveDirectoryImportWindow - { + public partial class ActiveDirectoryImportWindow + { + private string CurrentDomain; + #region Constructors - public ActiveDirectoryImportWindow(DockContent panel) - { - InitializeComponent(); - Runtime.FontOverride(this); - WindowType = WindowType.ActiveDirectoryImport; - DockPnl = panel; - } + + public ActiveDirectoryImportWindow(DockContent panel) + { + InitializeComponent(); + Runtime.FontOverride(this); + WindowType = WindowType.ActiveDirectoryImport; + DockPnl = panel; + CurrentDomain = Environment.UserDomainName; + } + #endregion - + #region Private Methods + #region Event Handlers - private void ADImport_Load(object sender, EventArgs e) - { - ApplyLanguage(); - txtDomain.Text = ActiveDirectoryTree.Domain; - EnableDisableImportButton(); - } + private void ADImport_Load(object sender, EventArgs e) + { + ApplyLanguage(); + txtDomain.Text = CurrentDomain; + ActiveDirectoryTree.Domain = CurrentDomain; + EnableDisableImportButton(); + } - private void btnImport_Click(object sender, EventArgs e) - { - var selectedNode = Windows.TreeForm.SelectedNode; - ContainerInfo importDestination; - if (selectedNode != null) - importDestination = selectedNode as ContainerInfo ?? selectedNode.Parent; - else - importDestination = Runtime.ConnectionTreeModel.RootNodes.First(); + private void btnImport_Click(object sender, EventArgs e) + { + var selectedNode = Windows.TreeForm.SelectedNode; + ContainerInfo importDestination; + if (selectedNode != null) + importDestination = selectedNode as ContainerInfo ?? selectedNode.Parent; + else + importDestination = Runtime.ConnectionTreeModel.RootNodes.First(); - Import.ImportFromActiveDirectory(ActiveDirectoryTree.ADPath, importDestination, chkSubOU.Checked); - } + Import.ImportFromActiveDirectory(ActiveDirectoryTree.ADPath, importDestination, chkSubOU.Checked); + } + /* private static void txtDomain_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e) { if (e.KeyCode == Keys.Enter) e.IsInputKey = true; } + */ - private void txtDomain_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode != Keys.Enter) return; - ChangeDomain(); - e.SuppressKeyPress = true; - } + private void txtDomain_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode != Keys.Enter) return; + ChangeDomain(); + e.SuppressKeyPress = true; + } - private void btnChangeDomain_Click(object sender, EventArgs e) - { - ChangeDomain(); - } + private void btnChangeDomain_Click(object sender, EventArgs e) + { + ChangeDomain(); + } + + private void ActiveDirectoryTree_ADPathChanged(object sender) + { + EnableDisableImportButton(); + } - private void ActiveDirectoryTree_ADPathChanged(object sender) - { - EnableDisableImportButton(); - } #endregion - - private void ApplyLanguage() - { - btnImport.Text = Language.strButtonImport; - lblDomain.Text = Language.strLabelDomain; - btnChangeDomain.Text = Language.strButtonChange; - } - - private void ChangeDomain() - { - ActiveDirectoryTree.Domain = txtDomain.Text; - ActiveDirectoryTree.Refresh(); - } - - private void EnableDisableImportButton() - { - btnImport.Enabled = !string.IsNullOrEmpty(ActiveDirectoryTree.ADPath); - } + + private void ApplyLanguage() + { + btnImport.Text = Language.strButtonImport; + lblDomain.Text = Language.strLabelDomain; + btnChangeDomain.Text = Language.strButtonChange; + } + + private void ChangeDomain() + { + CurrentDomain = txtDomain.Text; + ActiveDirectoryTree.Domain = CurrentDomain; + ActiveDirectoryTree.Refresh(); + } + + private void EnableDisableImportButton() + { + btnImport.Enabled = !string.IsNullOrEmpty(ActiveDirectoryTree.ADPath); + } + #endregion private void btnClose_Click(object sender, EventArgs e) From 34fa6b158b69445f2abac236436d70185175d151 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 13 Dec 2016 13:34:44 -0500 Subject: [PATCH 09/10] load the default domain when opening the form Related to #311 --- mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs index 0e1039906..373806c54 100644 --- a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs +++ b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs @@ -35,6 +35,9 @@ namespace mRemoteNG.UI.Window txtDomain.Text = CurrentDomain; ActiveDirectoryTree.Domain = CurrentDomain; EnableDisableImportButton(); + + // Domain doesn't refresh on load, so it defaults to DOMAIN without this... + ChangeDomain(); } private void btnImport_Click(object sender, EventArgs e) From 8d5a76504029e35afa42a0598bbe712617a903ff Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Tue, 13 Dec 2016 14:22:39 -0500 Subject: [PATCH 10/10] pass importSubOU option in to recursive calls Fixes remaining problems reported in #211 --- mRemoteV1/Config/Serializers/ActiveDirectoryDeserializer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Config/Serializers/ActiveDirectoryDeserializer.cs b/mRemoteV1/Config/Serializers/ActiveDirectoryDeserializer.cs index f98beb5f2..c8835c92d 100644 --- a/mRemoteV1/Config/Serializers/ActiveDirectoryDeserializer.cs +++ b/mRemoteV1/Config/Serializers/ActiveDirectoryDeserializer.cs @@ -66,7 +66,7 @@ namespace mRemoteNG.Config.Serializers // check/continue here so we don't create empty connection objects if(!_importSubOU) continue; - ActiveDirectoryImporter.Import(ldapResult.Path, parentContainer); + ActiveDirectoryImporter.Import(ldapResult.Path, parentContainer, _importSubOU); continue; }