Merge pull request #588 from mRemoteNG/hotfix7

Hotfix7 changelog

CHANGELOG.TXT

@@ -1,4 +1,22 @@
-1.75.7005 (2017-04-27)
+1.75.7007 (2017-06-14):
+
+Fixes:
+------
+#583: SSH (PuTTYNG) Sessions are not properly integrated into the main mRemoteNG window (Sorry!)
+
+
+1.75.7006 (2017-06-13):
+
+Fixes:
+------
+#377: Use all space on About page
+#527: Additional protections to avoid problems on update check in heavily firewalled environments
+#530: Fixed issue where using External Tool on existing connection causes creation of 'New Connection' entry
+#531: Update PuTTYNG to 0.69
+#546: Quick Connect from notification area icon displays warning when clicking on a folder (see #334)
+
+
+1.75.7005 (2017-04-27):
 
 Fixes:
 ------

README.MD

@@ -10,8 +10,8 @@
 
 | 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) |
+| 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.75Hotfix7/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75Hotfix7) |
+| Beta | | [![Github Releases (by Release)](https://img.shields.io/github/downloads/mRemoteNG/mRemoteNG/v1.75Hotfix7/total.svg)](https://github.com/mRemoteNG/mRemoteNG/releases/tag/v1.75Hotfix7) |
 | Development | [![Build Status](https://jenkins.mremoteng.org/buildStatus/icon?job=mRemoteNG/mRemoteNG/develop)](https://jenkins.mremoteng.org/job/mRemoteNG/job/mRemoteNG/job/develop/) | - |
 
 
@@ -26,9 +26,9 @@ Currently these protocols are supported:
  * VNC (Virtual Network Computing)
  * ICA (Independent Computing Architecture)
  * SSH (Secure Shell)
- * Telnet (TELecommunication NETwork)
- * HTTP/S (Hypertext Transfer Protocol)
- * Rlogin (Rlogin)
+ * Telnet (Teletype Network)
+ * HTTP/S (Hypertext Transfer Protocol Secure)
+ * Rlogin (Remote Login)
  * RAW
 
 mRemoteNG can be installed on Windows 7 or later.

mRemoteNGTests/Connection/ConnectionInfoTests.cs

@@ -48,6 +48,14 @@ namespace mRemoteNGTests.Connection
             Assert.That(secondConnection.Domain, Is.EqualTo(_connectionInfo.Domain));
         }
 
+        [Test]
+        public void CloneDoesNotSetParentOfNewConnectionInfo()
+        {
+            _connectionInfo.SetParent(new ContainerInfo());
+            var clonedConnection = _connectionInfo.Clone();
+            Assert.That(clonedConnection.Parent, Is.Null);
+        }
+
         [Test]
         public void CopyFromCopiesProperties()
         {

mRemoteNGTests/Container/ContainerInfoTests.cs

@@ -263,6 +263,14 @@ namespace mRemoteNGTests.Container
             Assert.That(clone.ConstantID, Is.Not.EqualTo(_containerInfo.ConstantID));
         }
 
+        [Test]
+        public void ClonedContainerDoesNotHaveParentSet()
+        {
+            _containerInfo.SetParent(new ContainerInfo());
+            var clone = _containerInfo.Clone();
+            Assert.That(clone.Parent, Is.Null);
+        }
+
         [Test]
         public void ClonedContainerContainsClonedChildren()
         {

mRemoteV1/App/Update/UpdateFile.cs

@@ -27,6 +27,9 @@ namespace mRemoteNG.App.Update
             char[] keyValueSeparators = { ':', '=' };
             char[] commentCharacters = { '#', ';', '\'' };
 
+            // no separators means no valid update data...
+            if (content.Trim().IndexOfAny(keyValueSeparators) == -1) return;
+
             using (var sr = new StringReader(content))
             {
                 string line;
@@ -43,6 +46,10 @@ namespace mRemoteNG.App.Update
                     if (parts.Length != 2)
                         continue;
 
+                    // make sure we have valid data in both parts before adding to the collection. If either part is empty, then it's not valid data.
+                    if(string.IsNullOrEmpty(parts[0].Trim()) || string.IsNullOrEmpty(parts[1].Trim()))
+                        continue;
+
                     Items.Add(parts[0].Trim(), parts[1].Trim());
                 }
             }

mRemoteV1/Connection/ConnectionInfo.cs

@@ -78,7 +78,6 @@ namespace mRemoteNG.Connection
 		    var newConnectionInfo = new ConnectionInfo();
             newConnectionInfo.CopyFrom(this);
 			newConnectionInfo.ConstantID = MiscTools.CreateConstantID();
-            newConnectionInfo.SetParent(Parent);
 		    newConnectionInfo.Inheritance = Inheritance.Clone();
 			return newConnectionInfo;
 		}

mRemoteV1/Container/ContainerInfo.cs

@@ -179,7 +179,6 @@ namespace mRemoteNG.Container
             var newContainer = new ContainerInfo();
             newContainer.CopyFrom(this);
             newContainer.ConstantID = MiscTools.CreateConstantID();
-            newContainer.SetParent(Parent);
             newContainer.OpenConnections = new ProtocolList();
             newContainer.Inheritance = Inheritance.Clone();
             foreach (var child in Children.ToArray())

mRemoteV1/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // <Assembly: AssemblyVersion("1.0.*")>
 
-[assembly: AssemblyVersion("1.75.7005.*")]
+[assembly: AssemblyVersion("1.75.7007.*")]
 
 [assembly:NeutralResourcesLanguageAttribute("en")]
 

mRemoteV1/Tools/NotificationAreaIcon.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Windows.Forms;
 using mRemoteNG.App;
 using mRemoteNG.Connection;
+using mRemoteNG.Container;
 using mRemoteNG.UI.Forms;
 
 
@@ -114,7 +115,7 @@ namespace mRemoteNG.Tools
         private void ConMenItem_MouseUp(object sender, MouseEventArgs e)
         {
             if (e.Button != MouseButtons.Left) return;
-            if (!(((ToolStripMenuItem) sender).Tag is ConnectionInfo)) return;
+            if (((ToolStripMenuItem)sender).Tag is ContainerInfo) return;
             if (frmMain.Default.Visible == false)
                 ShowForm();
             _connectionInitiator.OpenConnection((ConnectionInfo) ((ToolStripMenuItem) sender).Tag);

mRemoteV1/Tree/ConnectionTreeModel.cs

@@ -63,11 +63,6 @@ namespace mRemoteNG.Tree
             connectionInfo?.RemoveParent();
         }
 
-        public void CloneNode(ConnectionInfo connectionInfo)
-        {
-            connectionInfo.Clone();
-        }
-
         public event NotifyCollectionChangedEventHandler CollectionChanged;
         private void RaiseCollectionChangedEvent(object sender, NotifyCollectionChangedEventArgs args)
         {

mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs

@@ -215,6 +215,7 @@ namespace mRemoteNG.UI.Controls
         public void DuplicateSelectedNode()
         {
             var newNode = SelectedNode.Clone();
+            SelectedNode.Parent.AddChildBelow(newNode, SelectedNode);
             newNode.Parent.SetChildBelow(newNode, SelectedNode);
             Runtime.SaveConnectionsAsync();
         }

mRemoteV1/UI/Window/AboutWindow.cs

@@ -33,6 +33,7 @@ namespace mRemoteNG.UI.Window
             this.lblEdition = new System.Windows.Forms.Label();
             this.pbLogo = new System.Windows.Forms.PictureBox();
             this.pnlBottom = new System.Windows.Forms.Panel();
+            this.verText = new System.Windows.Forms.TextBox();
             this.lblCredits = new System.Windows.Forms.Label();
             this.txtCredits = new System.Windows.Forms.TextBox();
             this.txtChangeLog = new System.Windows.Forms.TextBox();
@@ -41,7 +42,6 @@ namespace mRemoteNG.UI.Window
             this.lblChangeLog = new System.Windows.Forms.Label();
             this.lblLicense = new System.Windows.Forms.Label();
             this.lblCopyright = new System.Windows.Forms.Label();
-            this.verText = new System.Windows.Forms.TextBox();
             this.pnlTop.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbLogo)).BeginInit();
             this.pnlBottom.SuspendLayout();
@@ -105,6 +105,18 @@ namespace mRemoteNG.UI.Window
             this.pnlBottom.Size = new System.Drawing.Size(1121, 559);
             this.pnlBottom.TabIndex = 1;
             // 
+            // verText
+            // 
+            this.verText.BackColor = System.Drawing.SystemColors.Control;
+            this.verText.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.verText.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.verText.Location = new System.Drawing.Point(69, 51);
+            this.verText.Name = "verText";
+            this.verText.Size = new System.Drawing.Size(147, 20);
+            this.verText.TabIndex = 12;
+            this.verText.TabStop = false;
+            this.verText.Text = "w.x.y.z";
+            // 
             // lblCredits
             // 
             this.lblCredits.AutoSize = true;
@@ -119,6 +131,8 @@ namespace mRemoteNG.UI.Window
             // 
             // txtCredits
             // 
+            this.txtCredits.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
             this.txtCredits.BackColor = System.Drawing.SystemColors.Control;
             this.txtCredits.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.txtCredits.Cursor = System.Windows.Forms.Cursors.Default;
@@ -136,6 +150,9 @@ namespace mRemoteNG.UI.Window
             // 
             // txtChangeLog
             // 
+            this.txtChangeLog.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.txtChangeLog.BackColor = System.Drawing.SystemColors.Control;
             this.txtChangeLog.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.txtChangeLog.Cursor = System.Windows.Forms.Cursors.Default;
@@ -211,18 +228,6 @@ namespace mRemoteNG.UI.Window
             this.lblCopyright.Text = "Copyright";
             this.lblCopyright.UseCompatibleTextRendering = true;
             // 
-            // verText
-            // 
-            this.verText.BackColor = System.Drawing.SystemColors.Control;
-            this.verText.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.verText.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.verText.Location = new System.Drawing.Point(69, 51);
-            this.verText.Name = "verText";
-            this.verText.Size = new System.Drawing.Size(147, 20);
-            this.verText.TabIndex = 12;
-            this.verText.TabStop = false;
-            this.verText.Text = "w.x.y.z";
-            // 
             // AboutWindow
             // 
             this.BackColor = System.Drawing.SystemColors.Control;
@@ -251,7 +256,8 @@ namespace mRemoteNG.UI.Window
 		public AboutWindow(DockContent Panel)
 		{
 			WindowType = WindowType.About;
-			DockPnl = Panel;
+		    DockPnl = Panel;
+            DockPnl = new DockContent();
 			InitializeComponent();
 			Runtime.FontOverride(this);
 		}