LT22418: per Hasso feedback; get PcPatrBrowser toolbar to work

Change-Id: If4b0548070e4dd451b528ef7fc0952330dbc5df3

Author: AndyBlack

Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/DisambiguateTest.cs

@@ -40,7 +40,9 @@ public override void FixtureSetup()
 				TestFile = kTestFile;
 			if (String.IsNullOrEmpty(SavedTestFile))
 				SavedTestFile = kTestFileB4;
-			TempTestFile = Path.Combine(Path.GetTempPath(), TestFile);
+
+			var temp = new IO.TempFile(Path.Combine(Path.GetTempPath(), TestFile), false);
+			TempTestFile = temp.Path;
 			File.Copy(Path.Combine(TestDataDir, SavedTestFile), TempTestFile, true);
 			ProjId = new ProjectId(TempTestFile);
 			FwRegistryHelper.Initialize();
@@ -66,10 +68,6 @@ public override void FixtureTeardown()
 			if (MyCache != null)
 			{
 				ProjectLockingService.UnlockCurrentProject(MyCache);
-				if (File.Exists(TempTestFile))
-				{
-					File.Delete(TempTestFile);
-				}
 			}
 		}
 	}

Src/Utilities/pcpatrflex/DisambiguateInFLExDB/PCPatrInvoker.cs

@@ -58,12 +58,7 @@ private void CreateBatchFile()
 			sbBatchFile.Append("\\pcpatr64\" -t ");
 			sbBatchFile.Append(takeFileName);
 			sbBatchFile.Append("\n");
-			string removeCRs = sbBatchFile.ToString().Replace("\r", "").Replace("
","");
-			File.WriteAllText(BatchFile, removeCRs);
-			Console.WriteLine("\nbatch file =");
-			Console.WriteLine("=================================================");
-			Console.Write(removeCRs);
-			Console.WriteLine("=================================================");
+			File.WriteAllText(BatchFile, sbBatchFile.ToString());
 		}
 
 		private string GetPcPatr64ExePath()
@@ -91,22 +86,14 @@ public void Invoke()
 			using (var process = Process.Start(processInfo))
 			{
 				process.PriorityClass = ProcessPriorityClass.High;
-				Console.WriteLine("\nBefore WaitForExit");
 				process.WaitForExit();
-				Console.WriteLine("\tAfter  WaitForExit");
 				string error = process.StandardError.ReadToEnd();
-				Console.WriteLine("\nStdErr=");
-				Console.WriteLine("=================================================");
-				Console.Write(error);
-				Console.WriteLine("=================================================");
 				if (error.Contains("ERROR "))
 				{
-					Console.WriteLine("\tFailure");
 					InvocationSucceeded = false;
 				}
 				else
 				{
-					Console.WriteLine("\tSuccess");
 					InvocationSucceeded = true;
 				}
 				process.StandardOutput.Close();
@@ -118,8 +105,6 @@ public void Invoke()
 		private void CreateTakeFile()
 		{
 			string takeFile = Path.Combine(Path.GetTempPath(), takeFileName);
-			//StringBuilder sbTakeFileShortPath = new StringBuilder(255);
-			//int i = GetShortPathName(takeFile, sbTakeFileShortPath, sbTakeFileShortPath.Capacity);
 			var sbTake = new StringBuilder();
 			sbTake.Append("set comment |\n");
 			sbTake.Append("log ");
@@ -128,15 +113,6 @@ private void CreateTakeFile()
 			sbTake.Append("load grammar ");
 			sbTake.Append(GrammarFile);
 			sbTake.Append("\n");
-			// See if the failure we're getting in GitHub is due to not finding the grammr file:
-			// We'll put it in the temp directory now.
-			//StringBuilder sbGrammarFileShortPath = new StringBuilder(255);
-			//i = GetShortPathName(
-			//	GrammarFile,
-			//	sbGrammarFileShortPath,
-			//	sbGrammarFileShortPath.Capacity
-			//);
-			//sbTake.Append(sbGrammarFileShortPath.ToString() + "\n");
 			sbTake.Append("set timing on\n");
 			sbTake.Append("set gloss on\n");
 			sbTake.Append("set features all\n");
@@ -155,13 +131,8 @@ private void CreateTakeFile()
 			// since the batch fle defaults to the temp directory, we just use the invoker files as they are
 			sbTake.Append("file disambiguate Invoker.ana Invoker.and\n");
 			sbTake.Append("exit\n");
-			string removeCRs = sbTake.ToString().Replace("\r", "").Replace("
", "");
-			File.WriteAllText(takeFile, removeCRs);
+			File.WriteAllText(takeFile, sbTake.ToString());
 			AndFile = Path.Combine(Path.GetTempPath(), "Invoker.and");
-			Console.WriteLine("\ntake file =");
-			Console.WriteLine("=================================================");
-			Console.Write(removeCRs);
-			Console.WriteLine("=================================================");
 		}
 
 		private void HandleRootGloss(StringBuilder sbTake)

Src/Utilities/pcpatrflex/ExtractAnaFilesFromTexts/Properties/Resources.Designer.cs

@@ -9,7 +9,7 @@ namespace SIL.PcPatrBrowser
 	/// <summary>
 	/// Summary description for GoToDialog.
 	/// </summary>
-	public class dlgGoTo : System.Windows.Forms.Form
+	public class GoToDialog : System.Windows.Forms.Form
 	{
 		private System.Windows.Forms.Label lblGoToPrompt;
 		private System.Windows.Forms.TextBox tbNumber;
@@ -21,7 +21,7 @@ public class dlgGoTo : System.Windows.Forms.Form
 		/// </summary>
 		private System.ComponentModel.Container components = null;
 
-		public dlgGoTo()
+		public GoToDialog()
 		{
 			//
 			// Required for Windows Form Designer support
@@ -83,7 +83,7 @@ public int Number
 		private void InitializeComponent()
 		{
 			System.Resources.ResourceManager resources = new System.Resources.ResourceManager(
-				typeof(dlgGoTo)
+				typeof(GoToDialog)
 			);
 			this.lblGoToPrompt = new System.Windows.Forms.Label();
 			this.tbNumber = new System.Windows.Forms.TextBox();

Src/Utilities/pcpatrflex/ExtractAnaFilesFromTexts/Properties/Resources.resx

@@ -1773,7 +1773,7 @@ private void miViewToolBar_Click(object sender, System.EventArgs e)
 
 		private void miSentenceGoTo_Click(object sender, System.EventArgs e)
 		{
-			dlgGoTo dlg = new dlgGoTo();
+			GoToDialog dlg = new GoToDialog();
 			dlg.Text = "Go To Sentence";
 			dlg.GoToPrompt = "&Go to sentence:";
 			dlg.ShowDialog();
@@ -1788,7 +1788,7 @@ private void miSentenceGoTo_Click(object sender, System.EventArgs e)
 
 		private void miParserGoTo_Click(object sender, System.EventArgs e)
 		{
-			dlgGoTo dlg = new dlgGoTo();
+			GoToDialog dlg = new GoToDialog();
 			dlg.Text = "Go To Parse";
 			dlg.GoToPrompt = "&Go to parse:";
 			dlg.ShowDialog();