Apply changes from latest GE version (#29)

Author: thimmy687

src/GitExtensions.GerritPlugin/FormGerritDownload.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using GitCommands;
+using GitCommands.Git.Commands;
 using GitUI;
 using GitUIPluginInterfaces;
 using Newtonsoft.Json.Linq;
@@ -126,7 +127,7 @@ private async Task<bool> DownloadChangeAsync(IWin32Window owner)
                             return;
                         }
 
-                        e.IsError = false;
+                        e = new GitRemoteCommandCompletedEventArgs(e.Command, false, e.Handled);
                     }
                 }
             };
@@ -223,7 +224,7 @@ private void FormGerritDownloadLoad(object sender, EventArgs e)
 
         private void AddRemoteClick(object sender, EventArgs e)
         {
-            UICommands.StartRemotesDialog();
+            UICommands.StartRemotesDialog(this);
             _NO_TRANSLATE_Remotes.DataSource = Module.GetRemoteNames();
         }
     }

src/GitExtensions.GerritPlugin/FormGerritPublish.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Windows.Forms;
 using GitExtensions.GerritPlugin.Server;
@@ -194,7 +193,7 @@ private void FormGerritPublishLoad(object sender, EventArgs e)
 
         private void AddRemoteClick(object sender, EventArgs e)
         {
-            UICommands.StartRemotesDialog();
+            UICommands.StartRemotesDialog(this);
             _NO_TRANSLATE_Remotes.DataSource = Module.GetRemoteNames();
         }
     }

src/GitExtensions.GerritPlugin/GerritPlugin.cs

@@ -154,8 +154,8 @@ private void Initialize(Form form)
 
             // Find the controls we're going to extend.
 
-            var menuStrip = form.FindDescendantOfType<MenuStrip>(p => p.Name == "menuStrip1");
-            var toolStrip = form.FindDescendantOfType<ToolStrip>(p => p.Name == "ToolStrip");
+            var menuStrip = form.FindDescendantOfType<MenuStrip>(p => p.Name == "mainMenuStrip");
+            var toolStrip = form.FindDescendantOfType<ToolStrip>(p => p.Name == "ToolStripMain");
 
             if (menuStrip == null)
             {

src/GitExtensions.GerritPlugin/GerritUtil.cs

@@ -68,7 +68,7 @@ public static async Task<string> RunGerritCommandAsync([NotNull] IWin32Window ow
 
             StartAgent(owner, module, remote);
 
-            var sshCmd = GitCommandHelpers.Plink()
+            var sshCmd = GitSshHelpers.Plink()
                 ? AppSettings.Plink
                 : SshPathLocatorInstance.Find(AppSettings.GitBinDir);
 
@@ -79,7 +79,7 @@ public static async Task<string> RunGerritCommandAsync([NotNull] IWin32Window ow
 
             string hostname = fetchUrl.Host;
             string username = fetchUrl.UserInfo;
-            string portFlag = GitCommandHelpers.Plink() ? " -P " : " -p ";
+            string portFlag = GitSshHelpers.Plink() ? " -P " : " -p ";
             int port = fetchUrl.Port;
 
             if (port == -1 && fetchUrl.Scheme == "ssh")
@@ -127,7 +127,7 @@ public static void StartAgent([NotNull] IWin32Window owner, [NotNull] IGitModule
                 throw new ArgumentNullException(nameof(remote));
             }
 
-            if (GitCommandHelpers.Plink())
+            if (GitSshHelpers.Plink())
             {
                 if (!File.Exists(AppSettings.Pageant))
                 {