From d2a4871e459930b981b2879cfe96811f1d007148 Mon Sep 17 00:00:00 2001
From: jradford <jradford@npl.com>
Date: Sat, 9 May 2015 17:02:46 -0700
Subject: [PATCH] Release 1.4.0.6 First release since moving to GitHub Update
 Checker implemented using GitHub API

---
 ReleaseNotes.txt                      |  10 +-
 SuperPutty/App.config                 |   6 +
 SuperPutty/GitRelease.cs              |  17 +
 SuperPutty/Properties/AssemblyInfo.cs |   6 +-
 SuperPutty/SuperPutty.csproj          |   7 +-
 SuperPutty/dlgEditSession.cs          | 458 +++++++++++++-------------
 SuperPutty/dlgFindPutty.Designer.cs   | 150 ++++++---
 SuperPutty/dlgFindPutty.cs            |   5 +-
 SuperPutty/frmSuperPutty.cs           |  25 +-
 9 files changed, 386 insertions(+), 298 deletions(-)
 create mode 100644 SuperPutty/GitRelease.cs

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 929bf73d..519a96f2 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,10 +1,14 @@
+1.4.0.6
+- Moved Project from Google Code to Github
+- 510: Fixed issue #530 Home directory prefix is now a configurable option
+
 1.4.0.5
 - 316: Add a caption when hovering over a session menu element showing the URL (in tree and new session menu)
 - 386: Made several dialogs fixed (non-sizeable) (Fixes Issue 222)
 - 385: Updated About Box with new icon courtesy of strugarevic (Resolves issue #160)
-- 384: Fixed Issue 345: Wrong tooltip on Options/GUI -> "Tabs and Docking" checkboxes
-- 383: Fixed Issue 428: Typing a square bracket in search box results in error
-- 382: Fixed Issue 354: popup descriptions incorrect.
+- 384: Fixed Issue #345: Wrong tooltip on Options/GUI -> "Tabs and Docking" checkboxes
+- 383: Fixed Issue #428: Typing a square bracket in search box results in error
+- 382: Fixed Issue #354: popup descriptions incorrect.
 - 381: Fixed Issue when connecting with pscp to transfer files where password request was not being recognized (it appears the format has changed from prior versions of pscp).
 - 380: Fixed Issue #431 Fix exception thrown when right clicking in LayoutsList outside of a valid session name
 - 376: update w/issue 316
diff --git a/SuperPutty/App.config b/SuperPutty/App.config
index 9c7977b7..d3886116 100644
--- a/SuperPutty/App.config
+++ b/SuperPutty/App.config
@@ -209,6 +209,12 @@
       <setting name="ShowMenuBar" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="PscpHomePrefix" serializeAs="String">
+        <value>/home/</value>
+      </setting>
+      <setting name="AutoUpdateCheck" serializeAs="String">
+        <value>False</value>
+      </setting>
     </SuperPutty.Properties.Settings>
   </userSettings>
 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
diff --git a/SuperPutty/GitRelease.cs b/SuperPutty/GitRelease.cs
new file mode 100644
index 00000000..8e53c2d4
--- /dev/null
+++ b/SuperPutty/GitRelease.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Runtime.Serialization.Json;
+using System.Runtime.Serialization;
+namespace SuperPutty
+{
+    [DataContract]
+    public class GitRelease
+    {
+        [DataMember(Name = "tag_name")]
+        public string version;
+        [DataMember(Name = "html_url")]
+        public string release_url;
+    }
+}
diff --git a/SuperPutty/Properties/AssemblyInfo.cs b/SuperPutty/Properties/AssemblyInfo.cs
index bd2ebaaa..d8d2925e 100644
--- a/SuperPutty/Properties/AssemblyInfo.cs
+++ b/SuperPutty/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("http://www.jimradford.com/")]
 [assembly: AssemblyProduct("SuperPuTTY")]
-[assembly: AssemblyCopyright("Copyright © 2009 - 2014 Jim Radford")]
+[assembly: AssemblyCopyright("Copyright © 2009 - 2015 Jim Radford")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.5")]
-[assembly: AssemblyFileVersion("1.4.0.5")]
+[assembly: AssemblyVersion("1.4.0.6")]
+[assembly: AssemblyFileVersion("1.4.0.6")]
diff --git a/SuperPutty/SuperPutty.csproj b/SuperPutty/SuperPutty.csproj
index 8fd80ac0..0a050600 100644
--- a/SuperPutty/SuperPutty.csproj
+++ b/SuperPutty/SuperPutty.csproj
@@ -68,6 +68,8 @@
     <Reference Include="System.configuration" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Web" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -89,6 +91,7 @@
       <DependentUpon>AboutBox1.cs</DependentUpon>
     </Compile>
     <Compile Include="Data\KeyboardShortcut.cs" />
+    <Compile Include="GitRelease.cs" />
     <Compile Include="Gui\BaseViewModel.cs" />
     <Compile Include="Gui\DataGridViewProgressColumn.cs" />
     <Compile Include="Gui\ImageListPopup.cs">
@@ -436,8 +439,8 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF NOT EXIST $(SolutionDir)bin\Debug\themes mkdir $(SolutionDir)bin\Debug\themes 
-IF NOT EXIST $(SolutionDir)bin\Debug\themes\default xcopy /E  /Y $(ProjectDir)Resources\themes $(SolutionDir)bin\Debug\themes</PostBuildEvent>
+    <PostBuildEvent>IF NOT EXIST $(SolutionDir)bin\Release\themes mkdir $(SolutionDir)bin\Release\themes 
+IF NOT EXIST $(SolutionDir)bin\Release\themes\default xcopy /E  /Y $(ProjectDir)Resources\themes $(SolutionDir)bin\Release\themes</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/SuperPutty/dlgEditSession.cs b/SuperPutty/dlgEditSession.cs
index 8bfc4eb6..6f2d9374 100644
--- a/SuperPutty/dlgEditSession.cs
+++ b/SuperPutty/dlgEditSession.cs
@@ -1,112 +1,112 @@
-/*
- * Copyright (c) 2009 Jim Radford http://www.jimradford.com
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions: 
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Web;
+/*
+ * Copyright (c) 2009 Jim Radford http://www.jimradford.com
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions: 
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using Microsoft.Win32;
+using System.Web;
 using SuperPutty.Data;
 using SuperPutty.Utils;
 using SuperPutty.Gui;
-using log4net;
-
-namespace SuperPutty
-{
-    public partial class dlgEditSession : Form
+using log4net;
+
+namespace SuperPutty
+{
+    public partial class dlgEditSession : Form
     {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(dlgEditSession));
-
-        public delegate bool SessionNameValidationHandler(string name, out string error);
-
-        private SessionData Session;
+        private static readonly ILog Log = LogManager.GetLogger(typeof(dlgEditSession));
+
+        public delegate bool SessionNameValidationHandler(string name, out string error);
+
+        private SessionData Session;
         private String OldHostname;
         private bool isInitialized = false;
-        private ImageListPopup imgPopup = null;
-
-        public dlgEditSession(SessionData session, ImageList iconList)
-        {
-            Session = session;
+        private ImageListPopup imgPopup = null;
+
+        public dlgEditSession(SessionData session, ImageList iconList)
+        {
+            Session = session;
             InitializeComponent();
 
-            // get putty saved settings from the registry to populate
-            // the dropdown
-            PopulatePuttySettings();
-
-            if (!String.IsNullOrEmpty(Session.SessionName))
-            {
-                this.Text = "Edit session: " + session.SessionName;
-                this.textBoxSessionName.Text = Session.SessionName;
-                this.textBoxHostname.Text = Session.Host;
-                this.textBoxPort.Text = Session.Port.ToString();
-                this.textBoxExtraArgs.Text = Session.ExtraArgs;
-                this.textBoxUsername.Text = Session.Username;
-
-                switch (Session.Proto)
-                {
-                    case ConnectionProtocol.Raw:
-                        radioButtonRaw.Checked = true;
-                        break;
-                    case ConnectionProtocol.Rlogin:
-                        radioButtonRlogin.Checked = true;
-                        break;
-                    case ConnectionProtocol.Serial:
-                        radioButtonSerial.Checked = true;
-                        break;
-                    case ConnectionProtocol.SSH:
-                        radioButtonSSH.Checked = true;
-                        break;
-                    case ConnectionProtocol.Telnet:
-                        radioButtonTelnet.Checked = true;
-                        break;
-                    case ConnectionProtocol.Cygterm:
-                        radioButtonCygterm.Checked = true;
+            // get putty saved settings from the registry to populate
+            // the dropdown
+            PopulatePuttySettings();
+
+            if (!String.IsNullOrEmpty(Session.SessionName))
+            {
+                this.Text = "Edit session: " + session.SessionName;
+                this.textBoxSessionName.Text = Session.SessionName;
+                this.textBoxHostname.Text = Session.Host;
+                this.textBoxPort.Text = Session.Port.ToString();
+                this.textBoxExtraArgs.Text = Session.ExtraArgs;
+                this.textBoxUsername.Text = Session.Username;
+
+                switch (Session.Proto)
+                {
+                    case ConnectionProtocol.Raw:
+                        radioButtonRaw.Checked = true;
+                        break;
+                    case ConnectionProtocol.Rlogin:
+                        radioButtonRlogin.Checked = true;
+                        break;
+                    case ConnectionProtocol.Serial:
+                        radioButtonSerial.Checked = true;
+                        break;
+                    case ConnectionProtocol.SSH:
+                        radioButtonSSH.Checked = true;
+                        break;
+                    case ConnectionProtocol.Telnet:
+                        radioButtonTelnet.Checked = true;
+                        break;
+                    case ConnectionProtocol.Cygterm:
+                        radioButtonCygterm.Checked = true;
                         break;
                     case ConnectionProtocol.Mintty:
                         radioButtonMintty.Checked = true;
                         break;
-                    default:
-                        radioButtonSSH.Checked = true;
-                        break;
-                }
-
-                foreach(String settings in this.comboBoxPuttyProfile.Items){
-                    if (settings == session.PuttySession)
-                    {
-                        this.comboBoxPuttyProfile.SelectedItem = settings;
-                        break;
-                    }
+                    default:
+                        radioButtonSSH.Checked = true;
+                        break;
                 }
 
-                this.buttonSave.Enabled = true;
-            }
-            else
-            {
-                this.Text = "Create new session";
+                foreach(String settings in this.comboBoxPuttyProfile.Items){
+                    if (settings == session.PuttySession)
+                    {
+                        this.comboBoxPuttyProfile.SelectedItem = settings;
+                        break;
+                    }
+                }
+
+                this.buttonSave.Enabled = true;
+            }
+            else
+            {
+                this.Text = "Create new session";
                 radioButtonSSH.Checked = true;
-                this.buttonSave.Enabled = false;
+                this.buttonSave.Enabled = false;
             }
 
 
@@ -118,146 +118,146 @@ public dlgEditSession(SessionData session, ImageList iconList)
             this.toolTip.SetToolTip(this.buttonImageSelect, buttonImageSelect.ImageKey);
 
             this.isInitialized = true;
-        }
-
-        protected override void OnLoad(EventArgs e)
-        {
-            base.OnLoad(e);
-
-            this.BeginInvoke(new MethodInvoker(delegate { this.textBoxSessionName.Focus(); }));
-        }
-
-        private void PopulatePuttySettings()
-        {
-            foreach (String sessionName in PuttyDataHelper.GetSessionNames())
-            {
-                comboBoxPuttyProfile.Items.Add(sessionName);
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+
+            this.BeginInvoke(new MethodInvoker(delegate { this.textBoxSessionName.Focus(); }));
+        }
+
+        private void PopulatePuttySettings()
+        {
+            foreach (String sessionName in PuttyDataHelper.GetSessionNames())
+            {
+                comboBoxPuttyProfile.Items.Add(sessionName);
             }
-            comboBoxPuttyProfile.SelectedItem = PuttyDataHelper.SessionDefaultSettings;
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            Session.SessionName = textBoxSessionName.Text.Trim();
-            Session.PuttySession = comboBoxPuttyProfile.Text.Trim();
-            Session.Host = textBoxHostname.Text.Trim();
-            Session.ExtraArgs = textBoxExtraArgs.Text.Trim();
-            Session.Port = int.Parse(textBoxPort.Text.Trim());
-            Session.Username = textBoxUsername.Text.Trim();
+            comboBoxPuttyProfile.SelectedItem = PuttyDataHelper.SessionDefaultSettings;
+        }
+
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            DialogResult = DialogResult.Cancel;
+        }
+
+        private void buttonSave_Click(object sender, EventArgs e)
+        {
+            Session.SessionName = textBoxSessionName.Text.Trim();
+            Session.PuttySession = comboBoxPuttyProfile.Text.Trim();
+            Session.Host = textBoxHostname.Text.Trim();
+            Session.ExtraArgs = textBoxExtraArgs.Text.Trim();
+            Session.Port = int.Parse(textBoxPort.Text.Trim());
+            Session.Username = textBoxUsername.Text.Trim();
             Session.SessionId = SessionData.CombineSessionIds(SessionData.GetSessionParentId(Session.SessionId), Session.SessionName);
-            Session.ImageKey = buttonImageSelect.ImageKey;
-
-            for (int i = 0; i < groupBox1.Controls.Count; i++)
-            {
-                RadioButton rb = (RadioButton)groupBox1.Controls[i];
-                if (rb.Checked)
-                {
-                    Session.Proto = (ConnectionProtocol)rb.Tag;
-                }
-            }
-            
-            DialogResult = DialogResult.OK;
-        }
-
-        /// <summary>
-        /// Special UI handling for cygterm or mintty sessions
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void radioButtonCygterm_CheckedChanged(object sender, EventArgs e)
-        {
+            Session.ImageKey = buttonImageSelect.ImageKey;
+
+            for (int i = 0; i < groupBox1.Controls.Count; i++)
+            {
+                RadioButton rb = (RadioButton)groupBox1.Controls[i];
+                if (rb.Checked)
+                {
+                    Session.Proto = (ConnectionProtocol)rb.Tag;
+                }
+            }
+            
+            DialogResult = DialogResult.OK;
+        }
+
+        /// <summary>
+        /// Special UI handling for cygterm or mintty sessions
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void radioButtonCygterm_CheckedChanged(object sender, EventArgs e)
+        {
             string host = this.textBoxHostname.Text;
-            bool isLocalShell = this.radioButtonCygterm.Checked || this.radioButtonMintty.Checked;
-            this.textBoxPort.Enabled = !isLocalShell;
-            this.textBoxExtraArgs.Enabled = !isLocalShell;
-            this.textBoxUsername.Enabled = !isLocalShell;
-
-            if (isLocalShell)
-            {
-                if (String.IsNullOrEmpty(host) || !host.StartsWith(CygtermStartInfo.LocalHost))
-                {
-                    OldHostname = this.textBoxHostname.Text;
-                    this.textBoxHostname.Text = CygtermStartInfo.LocalHost;
-                }
-            }
-
-        }
-
-        private void radioButtonRaw_CheckedChanged(object sender, EventArgs e)
-        {
-            if (this.radioButtonRaw.Checked && this.isInitialized)
-            {
-                if (!string.IsNullOrEmpty(OldHostname))
-                {
-                    this.textBoxHostname.Text = OldHostname;
-                    OldHostname = null;
-                }
-            }
-        }
-
-        private void radioButtonTelnet_CheckedChanged(object sender, EventArgs e)
-        {
-            if (this.radioButtonTelnet.Checked && this.isInitialized)
-            {
-                if (!string.IsNullOrEmpty(OldHostname))
-                {
-                    this.textBoxHostname.Text = OldHostname;
-                    OldHostname = null;
-                }
-                this.textBoxPort.Text = "23";
-            }
-        }
-
-        private void radioButtonRlogin_CheckedChanged(object sender, EventArgs e)
+            bool isLocalShell = this.radioButtonCygterm.Checked || this.radioButtonMintty.Checked;
+            this.textBoxPort.Enabled = !isLocalShell;
+            this.textBoxExtraArgs.Enabled = !isLocalShell;
+            this.textBoxUsername.Enabled = !isLocalShell;
+
+            if (isLocalShell)
+            {
+                if (String.IsNullOrEmpty(host) || !host.StartsWith(CygtermStartInfo.LocalHost))
+                {
+                    OldHostname = this.textBoxHostname.Text;
+                    this.textBoxHostname.Text = CygtermStartInfo.LocalHost;
+                }
+            }
+
+        }
+
+        private void radioButtonRaw_CheckedChanged(object sender, EventArgs e)
+        {
+            if (this.radioButtonRaw.Checked && this.isInitialized)
+            {
+                if (!string.IsNullOrEmpty(OldHostname))
+                {
+                    this.textBoxHostname.Text = OldHostname;
+                    OldHostname = null;
+                }
+            }
+        }
+
+        private void radioButtonTelnet_CheckedChanged(object sender, EventArgs e)
+        {
+            if (this.radioButtonTelnet.Checked && this.isInitialized)
+            {
+                if (!string.IsNullOrEmpty(OldHostname))
+                {
+                    this.textBoxHostname.Text = OldHostname;
+                    OldHostname = null;
+                }
+                this.textBoxPort.Text = "23";
+            }
+        }
+
+        private void radioButtonRlogin_CheckedChanged(object sender, EventArgs e)
         {
-            if (this.radioButtonRlogin.Checked && this.isInitialized)
-            {
-                if (!string.IsNullOrEmpty(OldHostname))
-                {
-                    this.textBoxHostname.Text = OldHostname;
-                    OldHostname = null;
-                }
-                this.textBoxPort.Text = "513";
-            }
-        }
-
-        private void radioButtonSSH_CheckedChanged(object sender, EventArgs e)
+            if (this.radioButtonRlogin.Checked && this.isInitialized)
+            {
+                if (!string.IsNullOrEmpty(OldHostname))
+                {
+                    this.textBoxHostname.Text = OldHostname;
+                    OldHostname = null;
+                }
+                this.textBoxPort.Text = "513";
+            }
+        }
+
+        private void radioButtonSSH_CheckedChanged(object sender, EventArgs e)
         {
-            if (this.radioButtonSSH.Checked && this.isInitialized)
-            {
-                if (!string.IsNullOrEmpty(OldHostname))
-                {
-                    this.textBoxHostname.Text = OldHostname;
-                    OldHostname = null;
-                }
-                this.textBoxPort.Text = "22";
-            }
+            if (this.radioButtonSSH.Checked && this.isInitialized)
+            {
+                if (!string.IsNullOrEmpty(OldHostname))
+                {
+                    this.textBoxHostname.Text = OldHostname;
+                    OldHostname = null;
+                }
+                this.textBoxPort.Text = "22";
+            }
         }
 
-
-
-        public static int GetDefaultPort(ConnectionProtocol protocol)
-        {
-            int port = 22;
-            switch (protocol)
-            {
-                case ConnectionProtocol.Raw:
-                    break;
-                case ConnectionProtocol.Rlogin:
-                    port = 513;
-                    break;
-                case ConnectionProtocol.Serial:
-                    break;
-                case ConnectionProtocol.Telnet:
-                    port = 23;
-                    break;
-            }
-            return port;
+
+
+        public static int GetDefaultPort(ConnectionProtocol protocol)
+        {
+            int port = 22;
+            switch (protocol)
+            {
+                case ConnectionProtocol.Raw:
+                    break;
+                case ConnectionProtocol.Rlogin:
+                    port = 513;
+                    break;
+                case ConnectionProtocol.Serial:
+                    break;
+                case ConnectionProtocol.Telnet:
+                    port = 23;
+                    break;
+            }
+            return port;
         }
 
         #region Icon
@@ -377,5 +377,5 @@ void EnableDisableSaveButton()
 
         #endregion
 
-    }
-}
+    }
+}
diff --git a/SuperPutty/dlgFindPutty.Designer.cs b/SuperPutty/dlgFindPutty.Designer.cs
index 9a58f988..a75cd317 100644
--- a/SuperPutty/dlgFindPutty.Designer.cs
+++ b/SuperPutty/dlgFindPutty.Designer.cs
@@ -71,10 +71,14 @@ private void InitializeComponent()
             this.checkRestrictFloatingWindows = new System.Windows.Forms.CheckBox();
             this.checkSessionsShowSearch = new System.Windows.Forms.CheckBox();
             this.label18 = new System.Windows.Forms.Label();
+            this.checkBoxCheckForUpdates = new System.Windows.Forms.CheckBox();
             this.checkConfirmTabClose = new System.Windows.Forms.CheckBox();
             this.tabControl = new System.Windows.Forms.TabControl();
             this.tabPageGeneral = new System.Windows.Forms.TabPage();
             this.tabPageGUI = new System.Windows.Forms.TabPage();
+            this.groupBox7 = new System.Windows.Forms.GroupBox();
+            this.textBoxHomeDirPrefix = new System.Windows.Forms.TextBox();
+            this.label16 = new System.Windows.Forms.Label();
             this.groupBox6 = new System.Windows.Forms.GroupBox();
             this.checkPuttyEnableNewSessionMenu = new System.Windows.Forms.CheckBox();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
@@ -90,23 +94,23 @@ private void InitializeComponent()
             this.label11 = new System.Windows.Forms.Label();
             this.tabPageShortcuts = new System.Windows.Forms.TabPage();
             this.dataGridViewShortcuts = new System.Windows.Forms.DataGridView();
-            this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.keyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.modifiersDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.shortcutStringDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colEdit = new System.Windows.Forms.DataGridViewButtonColumn();
             this.colClear = new System.Windows.Forms.DataGridViewButtonColumn();
-            this.keyboardShortcutBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.tabPageAdvanced = new System.Windows.Forms.TabPage();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.comboBoxActivatorType = new System.Windows.Forms.ComboBox();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
             this.panelBottom = new System.Windows.Forms.Panel();
             this.fontDialog = new System.Windows.Forms.FontDialog();
-            this.checkBoxCheckForUpdates = new System.Windows.Forms.CheckBox();
+            this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.keyDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.modifiersDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.shortcutStringDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.keyboardShortcutBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.tabControl.SuspendLayout();
             this.tabPageGeneral.SuspendLayout();
             this.tabPageGUI.SuspendLayout();
+            this.groupBox7.SuspendLayout();
             this.groupBox6.SuspendLayout();
             this.groupBox3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDownOpacity)).BeginInit();
@@ -114,11 +118,11 @@ private void InitializeComponent()
             this.groupBox1.SuspendLayout();
             this.tabPageShortcuts.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShortcuts)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.keyboardShortcutBindingSource)).BeginInit();
             this.tabPageAdvanced.SuspendLayout();
             this.groupBox5.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.panelBottom.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.keyboardShortcutBindingSource)).BeginInit();
             this.SuspendLayout();
             // 
             // buttonOk
@@ -526,6 +530,17 @@ private void InitializeComponent()
             this.label18.Text = "Other";
             this.toolTip.SetToolTip(this.label18, "Determines how tabs are named and if they respond to the shell\'s title changing");
             // 
+            // checkBoxCheckForUpdates
+            // 
+            this.checkBoxCheckForUpdates.AutoSize = true;
+            this.checkBoxCheckForUpdates.Location = new System.Drawing.Point(286, 69);
+            this.checkBoxCheckForUpdates.Name = "checkBoxCheckForUpdates";
+            this.checkBoxCheckForUpdates.Size = new System.Drawing.Size(180, 17);
+            this.checkBoxCheckForUpdates.TabIndex = 30;
+            this.checkBoxCheckForUpdates.Text = "Automatically Check for Updates";
+            this.toolTip.SetToolTip(this.checkBoxCheckForUpdates, "Check for Updates when Application starts");
+            this.checkBoxCheckForUpdates.UseVisualStyleBackColor = true;
+            // 
             // checkConfirmTabClose
             // 
             this.checkConfirmTabClose.AutoSize = true;
@@ -576,6 +591,7 @@ private void InitializeComponent()
             // 
             // tabPageGUI
             // 
+            this.tabPageGUI.Controls.Add(this.groupBox7);
             this.tabPageGUI.Controls.Add(this.groupBox6);
             this.tabPageGUI.Controls.Add(this.groupBox3);
             this.tabPageGUI.Controls.Add(this.groupBox2);
@@ -588,6 +604,33 @@ private void InitializeComponent()
             this.tabPageGUI.Text = "GUI";
             this.tabPageGUI.UseVisualStyleBackColor = true;
             // 
+            // groupBox7
+            // 
+            this.groupBox7.Controls.Add(this.textBoxHomeDirPrefix);
+            this.groupBox7.Controls.Add(this.label16);
+            this.groupBox7.Location = new System.Drawing.Point(358, 44);
+            this.groupBox7.Name = "groupBox7";
+            this.groupBox7.Size = new System.Drawing.Size(232, 79);
+            this.groupBox7.TabIndex = 42;
+            this.groupBox7.TabStop = false;
+            this.groupBox7.Text = "File Transfer Options";
+            // 
+            // textBoxHomeDirPrefix
+            // 
+            this.textBoxHomeDirPrefix.Location = new System.Drawing.Point(125, 20);
+            this.textBoxHomeDirPrefix.Name = "textBoxHomeDirPrefix";
+            this.textBoxHomeDirPrefix.Size = new System.Drawing.Size(100, 20);
+            this.textBoxHomeDirPrefix.TabIndex = 1;
+            // 
+            // label16
+            // 
+            this.label16.AutoSize = true;
+            this.label16.Location = new System.Drawing.Point(10, 23);
+            this.label16.Name = "label16";
+            this.label16.Size = new System.Drawing.Size(109, 13);
+            this.label16.TabIndex = 0;
+            this.label16.Text = "Home Directory Prefix";
+            // 
             // groupBox6
             // 
             this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -596,7 +639,7 @@ private void InitializeComponent()
             this.groupBox6.Controls.Add(this.label18);
             this.groupBox6.Location = new System.Drawing.Point(358, 3);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(232, 120);
+            this.groupBox6.Size = new System.Drawing.Size(232, 34);
             this.groupBox6.TabIndex = 41;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "Session Panel";
@@ -680,6 +723,11 @@ private void InitializeComponent()
             this.numericUpDownOpacity.Name = "numericUpDownOpacity";
             this.numericUpDownOpacity.Size = new System.Drawing.Size(120, 20);
             this.numericUpDownOpacity.TabIndex = 32;
+            this.numericUpDownOpacity.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            0});
             // 
             // groupBox2
             // 
@@ -776,38 +824,6 @@ private void InitializeComponent()
             this.dataGridViewShortcuts.TabIndex = 0;
             this.dataGridViewShortcuts.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewShortcuts_CellClick);
             // 
-            // nameDataGridViewTextBoxColumn
-            // 
-            this.nameDataGridViewTextBoxColumn.DataPropertyName = "Name";
-            this.nameDataGridViewTextBoxColumn.HeaderText = "Name";
-            this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
-            this.nameDataGridViewTextBoxColumn.ReadOnly = true;
-            this.nameDataGridViewTextBoxColumn.Width = 200;
-            // 
-            // keyDataGridViewTextBoxColumn
-            // 
-            this.keyDataGridViewTextBoxColumn.DataPropertyName = "Key";
-            this.keyDataGridViewTextBoxColumn.HeaderText = "Key";
-            this.keyDataGridViewTextBoxColumn.Name = "keyDataGridViewTextBoxColumn";
-            this.keyDataGridViewTextBoxColumn.ReadOnly = true;
-            this.keyDataGridViewTextBoxColumn.Visible = false;
-            // 
-            // modifiersDataGridViewTextBoxColumn
-            // 
-            this.modifiersDataGridViewTextBoxColumn.DataPropertyName = "Modifiers";
-            this.modifiersDataGridViewTextBoxColumn.HeaderText = "Modifiers";
-            this.modifiersDataGridViewTextBoxColumn.Name = "modifiersDataGridViewTextBoxColumn";
-            this.modifiersDataGridViewTextBoxColumn.ReadOnly = true;
-            this.modifiersDataGridViewTextBoxColumn.Visible = false;
-            // 
-            // shortcutStringDataGridViewTextBoxColumn
-            // 
-            this.shortcutStringDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.shortcutStringDataGridViewTextBoxColumn.DataPropertyName = "ShortcutString";
-            this.shortcutStringDataGridViewTextBoxColumn.HeaderText = "Shortcut";
-            this.shortcutStringDataGridViewTextBoxColumn.Name = "shortcutStringDataGridViewTextBoxColumn";
-            this.shortcutStringDataGridViewTextBoxColumn.ReadOnly = true;
-            // 
             // colEdit
             // 
             this.colEdit.HeaderText = "";
@@ -826,10 +842,6 @@ private void InitializeComponent()
             this.colClear.UseColumnTextForButtonValue = true;
             this.colClear.Width = 50;
             // 
-            // keyboardShortcutBindingSource
-            // 
-            this.keyboardShortcutBindingSource.DataSource = typeof(SuperPutty.Data.KeyboardShortcut);
-            // 
             // tabPageAdvanced
             // 
             this.tabPageAdvanced.Controls.Add(this.groupBox5);
@@ -892,16 +904,41 @@ private void InitializeComponent()
             this.panelBottom.Size = new System.Drawing.Size(604, 27);
             this.panelBottom.TabIndex = 39;
             // 
-            // checkBoxCheckForUpdates
+            // nameDataGridViewTextBoxColumn
             // 
-            this.checkBoxCheckForUpdates.AutoSize = true;
-            this.checkBoxCheckForUpdates.Location = new System.Drawing.Point(286, 69);
-            this.checkBoxCheckForUpdates.Name = "checkBoxCheckForUpdates";
-            this.checkBoxCheckForUpdates.Size = new System.Drawing.Size(180, 17);
-            this.checkBoxCheckForUpdates.TabIndex = 30;
-            this.checkBoxCheckForUpdates.Text = "Automatically Check for Updates";
-            this.toolTip.SetToolTip(this.checkBoxCheckForUpdates, "Check for Updates when Application starts");
-            this.checkBoxCheckForUpdates.UseVisualStyleBackColor = true;
+            this.nameDataGridViewTextBoxColumn.DataPropertyName = "Name";
+            this.nameDataGridViewTextBoxColumn.HeaderText = "Name";
+            this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn";
+            this.nameDataGridViewTextBoxColumn.ReadOnly = true;
+            this.nameDataGridViewTextBoxColumn.Width = 200;
+            // 
+            // keyDataGridViewTextBoxColumn
+            // 
+            this.keyDataGridViewTextBoxColumn.DataPropertyName = "Key";
+            this.keyDataGridViewTextBoxColumn.HeaderText = "Key";
+            this.keyDataGridViewTextBoxColumn.Name = "keyDataGridViewTextBoxColumn";
+            this.keyDataGridViewTextBoxColumn.ReadOnly = true;
+            this.keyDataGridViewTextBoxColumn.Visible = false;
+            // 
+            // modifiersDataGridViewTextBoxColumn
+            // 
+            this.modifiersDataGridViewTextBoxColumn.DataPropertyName = "Modifiers";
+            this.modifiersDataGridViewTextBoxColumn.HeaderText = "Modifiers";
+            this.modifiersDataGridViewTextBoxColumn.Name = "modifiersDataGridViewTextBoxColumn";
+            this.modifiersDataGridViewTextBoxColumn.ReadOnly = true;
+            this.modifiersDataGridViewTextBoxColumn.Visible = false;
+            // 
+            // shortcutStringDataGridViewTextBoxColumn
+            // 
+            this.shortcutStringDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.shortcutStringDataGridViewTextBoxColumn.DataPropertyName = "ShortcutString";
+            this.shortcutStringDataGridViewTextBoxColumn.HeaderText = "Shortcut";
+            this.shortcutStringDataGridViewTextBoxColumn.Name = "shortcutStringDataGridViewTextBoxColumn";
+            this.shortcutStringDataGridViewTextBoxColumn.ReadOnly = true;
+            // 
+            // keyboardShortcutBindingSource
+            // 
+            this.keyboardShortcutBindingSource.DataSource = typeof(SuperPutty.Data.KeyboardShortcut);
             // 
             // dlgFindPutty
             // 
@@ -926,6 +963,8 @@ private void InitializeComponent()
             this.tabPageGeneral.ResumeLayout(false);
             this.tabPageGeneral.PerformLayout();
             this.tabPageGUI.ResumeLayout(false);
+            this.groupBox7.ResumeLayout(false);
+            this.groupBox7.PerformLayout();
             this.groupBox6.ResumeLayout(false);
             this.groupBox6.PerformLayout();
             this.groupBox3.ResumeLayout(false);
@@ -937,13 +976,13 @@ private void InitializeComponent()
             this.groupBox1.PerformLayout();
             this.tabPageShortcuts.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShortcuts)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.keyboardShortcutBindingSource)).EndInit();
             this.tabPageAdvanced.ResumeLayout(false);
             this.groupBox5.ResumeLayout(false);
             this.groupBox5.PerformLayout();
             this.groupBox4.ResumeLayout(false);
             this.groupBox4.PerformLayout();
             this.panelBottom.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.keyboardShortcutBindingSource)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1024,5 +1063,8 @@ private void InitializeComponent()
         private System.Windows.Forms.CheckBox checkPuttyEnableNewSessionMenu;
         private System.Windows.Forms.Label label18;
         private System.Windows.Forms.CheckBox checkBoxCheckForUpdates;
+        private System.Windows.Forms.GroupBox groupBox7;
+        private System.Windows.Forms.TextBox textBoxHomeDirPrefix;
+        private System.Windows.Forms.Label label16;
     }
 }
\ No newline at end of file
diff --git a/SuperPutty/dlgFindPutty.cs b/SuperPutty/dlgFindPutty.cs
index f7d1834c..e2a5c857 100644
--- a/SuperPutty/dlgFindPutty.cs
+++ b/SuperPutty/dlgFindPutty.cs
@@ -192,6 +192,8 @@ public dlgFindPutty()
             this.checkSessionsShowSearch.Checked = SuperPuTTY.Settings.SessionsShowSearch;
             this.checkPuttyEnableNewSessionMenu.Checked = SuperPuTTY.Settings.PuttyPanelShowNewSessionMenu;
             this.checkBoxCheckForUpdates.Checked = SuperPuTTY.Settings.AutoUpdateCheck;
+            this.textBoxHomeDirPrefix.Text = SuperPuTTY.Settings.PscpHomePrefix;
+
             if (SuperPuTTY.IsFirstRun)
             {
                 this.ShowIcon = true;
@@ -305,6 +307,7 @@ private void buttonOk_Click(object sender, EventArgs e)
                 SuperPuTTY.Settings.SessionsShowSearch = this.checkSessionsShowSearch.Checked;
                 SuperPuTTY.Settings.PuttyPanelShowNewSessionMenu = this.checkPuttyEnableNewSessionMenu.Checked;
                 SuperPuTTY.Settings.AutoUpdateCheck = this.checkBoxCheckForUpdates.Checked;
+                SuperPuTTY.Settings.PscpHomePrefix = this.textBoxHomeDirPrefix.Text;
 
                 // save shortcuts
                 KeyboardShortcut[] shortcuts = new KeyboardShortcut[this.Shortcuts.Count];
@@ -391,7 +394,7 @@ private void btnBrowseMintty_Click(object sender, EventArgs e)
         /// </summary>
         public static void PuttyCheck()
         {
-            if (String.IsNullOrEmpty(SuperPuTTY.Settings.PuttyExe) || SuperPuTTY.IsFirstRun)
+            if (String.IsNullOrEmpty(SuperPuTTY.Settings.PuttyExe) || SuperPuTTY.IsFirstRun || !File.Exists(SuperPuTTY.Settings.PuttyExe))
             {
                 // first time, try to import old putty settings from registry
                 SuperPuTTY.Settings.ImportFromRegistry();
diff --git a/SuperPutty/frmSuperPutty.cs b/SuperPutty/frmSuperPutty.cs
index b3c954f7..0bfcd0fc 100644
--- a/SuperPutty/frmSuperPutty.cs
+++ b/SuperPutty/frmSuperPutty.cs
@@ -43,6 +43,7 @@
 using System.Threading;
 using log4net.Core;
 using System.Text.RegularExpressions;
+using System.Runtime.Serialization.Json;
 
 namespace SuperPutty
 {
@@ -84,11 +85,12 @@ public partial class frmSuperPutty : Form
         Dictionary<Keys, SuperPuttyAction> shortcuts = new Dictionary<Keys, SuperPuttyAction>();
 
         public frmSuperPutty()
-        {
+        {                        
             // Verify Putty is set; Prompt user if necessary; exit otherwise
             dlgFindPutty.PuttyCheck();
 
             InitializeComponent();
+
             // force toolbar locations...designer likes to flip them around
             this.tsConnect.Location = new System.Drawing.Point(0, 24);
             this.tsCommands.Location = new System.Drawing.Point(0, 49);
@@ -1529,22 +1531,27 @@ private void checkForUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
         {
             Log.Info("Checking for application update");
             httpRequest r = new httpRequest();
-            r.MakeRequest("https://code.google.com/p/superputty/wiki/Downloads?" + SuperPuTTY.Version, delegate(bool success, string content)
+            r.MakeRequest("https://api.github.com/repos/jimradford/superputty/releases/latest", delegate(bool success, string content)
             {
                 if (success)
                 {
-                    if (!content.Contains("Current stable version (" + SuperPuTTY.Version + "):"))
+                    DataContractJsonSerializer js = new DataContractJsonSerializer(typeof(GitRelease));
+                    MemoryStream ms = new MemoryStream(System.Text.ASCIIEncoding.ASCII.GetBytes(content));
+                    GitRelease  latest = (GitRelease)js.ReadObject(ms);                                        
+                    ms.Close();
+                    
+                    if (!latest.version.Trim().Contains(SuperPuTTY.Version))
                     {
-                        Log.Info("New Application version found! " + content.TrimEnd());
+                        Log.Info("New Application version found! " + latest.version);
 
-                        if (MessageBox.Show("An updated version of SuperPuTTY is Available Would you like to visit the download page?",
+                        if (MessageBox.Show("An updated version of SuperPuTTY (" + latest.version + ") is Available Would you like to visit the download page to upgrade?",
                             "SuperPutty Update Found",
                             MessageBoxButtons.YesNo,
                             MessageBoxIcon.Question,
                             MessageBoxDefaultButton.Button1,
                             MessageBoxOptions.DefaultDesktopOnly) == System.Windows.Forms.DialogResult.Yes)
                         {
-                            Process.Start("https://code.google.com/p/superputty/wiki/Downloads");
+                            Process.Start(latest.release_url);
                         }
                     }
                     else
@@ -1555,6 +1562,12 @@ private void checkForUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
                         }
                     }
                 }
+                else
+                {
+                    // error occurred while making api request
+                    var foo = r;
+                    Console.WriteLine(r);
+                }
             });
 
         }