From 7aa3e4dbcdd34bc9b204549f79660e22d5802fd8 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Tue, 30 Oct 2018 16:41:56 -0700
Subject: [PATCH] Show "assembling" when assembling

Merlin 32 is slow enough with a 64K data file that you have
enough time to read the text.
---
 Asm65/OpDescription.cs                     | 2 +-
 SourceGen/AsmGen/AsmCc65.cs                | 2 ++
 SourceGen/AsmGen/AsmMerlin32.cs            | 2 ++
 SourceGen/AsmGen/AsmTass64.cs              | 2 ++
 SourceGen/Properties/Resources.Designer.cs | 9 +++++++++
 SourceGen/Properties/Resources.resx        | 3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Asm65/OpDescription.cs b/Asm65/OpDescription.cs
index e26f728..f7dff42 100644
--- a/Asm65/OpDescription.cs
+++ b/Asm65/OpDescription.cs
@@ -711,7 +711,7 @@ namespace Asm65 {
             { OpDef.AddressMode.StackRTI, "" },
             { OpDef.AddressMode.StackRTL, "" },
             { OpDef.AddressMode.StackRTS, "" },
-            { OpDef.AddressMode.StackRel, "" },
+            { OpDef.AddressMode.StackRel, "Stack Relative" },
             { OpDef.AddressMode.StackRelIndIndexY, "Stack Relative Indirect Index Y" },
             { OpDef.AddressMode.WDM, "" }
         };
diff --git a/SourceGen/AsmGen/AsmCc65.cs b/SourceGen/AsmGen/AsmCc65.cs
index bce060b..db20bac 100644
--- a/SourceGen/AsmGen/AsmCc65.cs
+++ b/SourceGen/AsmGen/AsmCc65.cs
@@ -782,6 +782,8 @@ namespace SourceGen.AsmGen {
                 return null;
             }
 
+            worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING);
+
             // Wrap pathname in quotes in case it has spaces.
             // (Do we need to shell-escape quotes in the pathName?)
             ShellCommand cmd = new ShellCommand(config.ExecutablePath,
diff --git a/SourceGen/AsmGen/AsmMerlin32.cs b/SourceGen/AsmGen/AsmMerlin32.cs
index e06a8d0..9414c2f 100644
--- a/SourceGen/AsmGen/AsmMerlin32.cs
+++ b/SourceGen/AsmGen/AsmMerlin32.cs
@@ -741,6 +741,8 @@ namespace SourceGen.AsmGen {
                 return null;
             }
 
+            worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING);
+
             // Wrap pathname in quotes in case it has spaces.
             // (Do we need to shell-escape quotes in the pathName?)
             ShellCommand cmd = new ShellCommand(config.ExecutablePath, ". \"" + pathName + "\"",
diff --git a/SourceGen/AsmGen/AsmTass64.cs b/SourceGen/AsmGen/AsmTass64.cs
index 6dcd92f..4c11f38 100644
--- a/SourceGen/AsmGen/AsmTass64.cs
+++ b/SourceGen/AsmGen/AsmTass64.cs
@@ -754,6 +754,8 @@ namespace SourceGen.AsmGen {
                 return null;
             }
 
+            worker.ReportProgress(0, Properties.Resources.PROGRESS_ASSEMBLING);
+
             string options = "--case-sensitive --nostart --long-address -Wall";
             string outFileName = pathName.Substring(0, pathName.Length - 2);
 
diff --git a/SourceGen/Properties/Resources.Designer.cs b/SourceGen/Properties/Resources.Designer.cs
index 02f1d2f..fb46157 100644
--- a/SourceGen/Properties/Resources.Designer.cs
+++ b/SourceGen/Properties/Resources.Designer.cs
@@ -753,6 +753,15 @@ namespace SourceGen.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Executing assembler....
+        /// </summary>
+        internal static string PROGRESS_ASSEMBLING {
+            get {
+                return ResourceManager.GetString("PROGRESS_ASSEMBLING", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Generating {0}....
         /// </summary>
diff --git a/SourceGen/Properties/Resources.resx b/SourceGen/Properties/Resources.resx
index 8a6ceb4..87ee568 100644
--- a/SourceGen/Properties/Resources.resx
+++ b/SourceGen/Properties/Resources.resx
@@ -348,6 +348,9 @@
   <data name="PLUGIN_DIR_FAIL_CAPTION" xml:space="preserve">
     <value>Failed Preparing Plugin Directory</value>
   </data>
+  <data name="PROGRESS_ASSEMBLING" xml:space="preserve">
+    <value>Executing assembler...</value>
+  </data>
   <data name="PROGRESS_GENERATING_FMT" xml:space="preserve">
     <value>Generating {0}...</value>
   </data>