Move WPF code from SourceGenWPF to SourceGen

SourceGen/AddressMap.cs

@@ -18,7 +18,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Map file offsets to 65xx addresses and vice-versa.  Useful for sources with
     /// multiple ORG directives.

SourceGen/Anattrib.cs

@@ -19,7 +19,7 @@ using System.Text;
 
 using Asm65;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Analyzer attribute holder.  Contains the output of the instruction and data analyzers.
     /// Every byte in the input file has one of these associated with it.

SourceGen/App.xaml

@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Application x:Class="SourceGenWPF.App"
+<Application x:Class="SourceGen.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:SourceGenWPF"
+             xmlns:local="clr-namespace:SourceGen"
              StartupUri="WpfGui/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>

SourceGen/App.xaml.cs

@@ -14,14 +14,9 @@
  * limitations under the License.
  */
 using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>

SourceGen/AppSettings.cs

@@ -19,7 +19,7 @@ using System.Diagnostics;
 using System.Text;
 using System.Web.Script.Serialization;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Application settings registry.  This holds both user-accessible settings and saved
     /// values like window widths.

SourceGen/AsmGen/AsmCc65.cs

@@ -23,7 +23,7 @@ using System.Text;
 using Asm65;
 using CommonUtil;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     #region IGenerator
 
     /// <summary>

SourceGen/AsmGen/AsmMerlin32.cs

@@ -23,7 +23,7 @@ using System.Text;
 using Asm65;
 using CommonUtil;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     #region IGenerator
 
     /// <summary>

SourceGen/AsmGen/AsmTass64.cs

@@ -23,7 +23,7 @@ using System.Text;
 using Asm65;
 using CommonUtil;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     #region IGenerator
 
     /// <summary>

SourceGen/AsmGen/AssemblerConfig.cs

@@ -17,7 +17,7 @@ using System;
 using System.Diagnostics;
 using System.Web.Script.Serialization;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     /// <summary>
     /// Assembler configuration holder.  Serializes and deserializes information held in
     /// application settings.

SourceGen/AsmGen/AssemblerInfo.cs

@@ -18,7 +18,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     /// <summary>
     /// Static information on assemblers supported by SourceGen.  This is relevant for both
     /// assembly source generation and assembler execution.  Nothing here is affected

SourceGen/AsmGen/AssemblerVersion.cs

@@ -17,7 +17,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     public class AssemblerVersion {
         /// <summary>
         /// Version string reported by the assembler.  Retained mostly for debugging.

SourceGen/AsmGen/GenCommon.cs

@@ -21,7 +21,7 @@ using System.IO;
 
 using Asm65;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     public class GenCommon {
         /// <summary>
         /// Generates assembly source.

SourceGen/AsmGen/IAssembler.cs

@@ -17,7 +17,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     /// <summary>
     /// Common interface for executing assemblers.
     /// </summary>

SourceGen/AsmGen/IGenerator.cs

@@ -19,7 +19,7 @@ using System.ComponentModel;
 
 using Asm65;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     /// <summary>
     /// Common interface for generating assembler-specific source code.
     /// </summary>

SourceGen/AsmGen/LabelLocalizer.cs

@@ -76,7 +76,7 @@ The eventual output of our efforts is a map from the original symbol name to the
 name.  This must be applied to both labels and operands.
 */
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     public class LabelLocalizer {
         /// <summary>
         /// A pairing of an offset with a label string.  (Essentially mAnattribs[n].Symbol

SourceGen/AsmGen/StringGather.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Diagnostics;
 
-namespace SourceGenWPF.AsmGen {
+namespace SourceGen.AsmGen {
     /// <summary>
     /// Multi-line string gatherer.  Accumulates characters and raw bytes, emitting
     /// them when we have a full operand's worth.

SourceGen/AsmGen/WpfGui/GenAndAsm.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.AsmGen.WpfGui.GenAndAsm"
+<Window x:Class="SourceGen.AsmGen.WpfGui.GenAndAsm"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.AsmGen.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.AsmGen.WpfGui"
         mc:Ignorable="d"
         Title="Generate and Assemble"
         Width="800" Height="700" MinWidth="600" MinHeight="600" ResizeMode="CanResizeWithGrip"

SourceGen/AsmGen/WpfGui/GenAndAsm.xaml.cs

@@ -24,9 +24,9 @@ using System.Windows.Controls;
 
 using CommonUtil;
 using CommonWPF;
-using SourceGenWPF.WpfGui;
+using SourceGen.WpfGui;
 
-namespace SourceGenWPF.AsmGen.WpfGui {
+namespace SourceGen.AsmGen.WpfGui {
     /// <summary>
     /// Code generation and assembler execution dialog.
     /// </summary>

SourceGen/AutoLabel.cs

@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Diagnostics;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Functions for generation of "auto" labels.
     /// </summary>

SourceGen/ChangeSet.cs

@@ -18,7 +18,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Holds information about a set of changes.
     /// 

SourceGen/CodeAnalysis.cs

@@ -20,9 +20,9 @@ using System.Diagnostics;
 using Asm65;
 using CommonUtil;
 using PluginCommon;
-using SourceGenWPF.Sandbox;
+using SourceGen.Sandbox;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Instruction analyzer.
     /// 

SourceGen/DataAnalysis.cs

@@ -19,7 +19,7 @@ using System.Diagnostics;
 using Asm65;
 using CommonUtil;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Auto-detection of structured data.
     /// 

SourceGen/DefSymbol.cs

@@ -17,7 +17,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Subclass of Symbol used for symbols defined in the platform or project.
     /// 

SourceGen/DisasmProject.cs

@@ -21,9 +21,9 @@ using System.Text;
 
 using Asm65;
 using CommonUtil;
-using SourceGenWPF.Sandbox;
+using SourceGen.Sandbox;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// All state for an open project.
     /// 

SourceGen/DisplayList.cs

@@ -21,7 +21,7 @@ using System.Diagnostics;
 using System.ComponentModel;
 using System.Windows.Media;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// List of items formatted for display.
     /// </summary>

SourceGen/DisplayListSelection.cs

@@ -21,7 +21,7 @@ using System.Windows.Controls;
 
 using CommonUtil;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Tracks the items selected in the DisplayList, using forwarded SelectionChanged events.
     /// When enumerated, provides an ordered list of selected indices.

SourceGen/ExternalFile.cs

@@ -17,7 +17,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Manages references to external files, notably symbol files (.sym65) and extension
     /// scripts.  Identifiers look like "RT:subdir/file.sym65".

SourceGen/FormatDescriptor.cs

@@ -17,7 +17,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Format descriptor for data items and instruction operands.  Instances are immutable.
     /// 

SourceGen/HelpAccess.cs

@@ -47,7 +47,7 @@ TODO(maybe): the web viewer accessible from WPF appears to be much better, so we
 simple browser window.
 */
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Help viewer API.
     /// </summary>

SourceGen/LineListGen.cs

@@ -20,9 +20,9 @@ using System.Windows.Media;
 using System.Text;
 
 using Asm65;
-using FormattedParts = SourceGenWPF.DisplayList.FormattedParts;
+using FormattedParts = SourceGen.DisplayList.FormattedParts;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Converts file data and Anattrib contents into a series of strings and format metadata.
     /// </summary>

SourceGen/MainController.cs

@@ -20,16 +20,16 @@ using System.IO;
 using System.Text;
 using System.Web.Script.Serialization;
 using System.Windows;
+using System.Windows.Input;
 using Microsoft.Win32;
 
 using Asm65;
 using CommonUtil;
 using CommonWPF;
-using SourceGenWPF.Sandbox;
-using SourceGenWPF.WpfGui;
-using System.Windows.Input;
+using SourceGen.Sandbox;
+using SourceGen.WpfGui;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// This class manages user interaction.  The goal is for this to be relatively
     /// GUI-toolkit-agnostic, with all the WPF stuff tucked into the code-behind files.  An

SourceGen/MultiLineComment.cs

@@ -19,7 +19,7 @@ using System.Diagnostics;
 using System.Windows.Media;
 using System.Text;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Representation of a multi-line comment, which is a string plus some format directives.
     /// Used for long comments and notes.

SourceGen/NavStack.cs

@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Maintains a record of interesting places we've been.
     /// </summary>

SourceGen/PlatformSymbols.cs

@@ -18,13 +18,11 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Reflection;
 using System.Text.RegularExpressions;
 
 using CommonUtil;
-using SourceGenWPF.Sandbox;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Loads and maintains a collection of platform-specific symbols from a ".sym65" file.
     /// </summary>

SourceGen/ProjectFile.cs

@@ -23,7 +23,7 @@ using System.Windows.Media;
 
 using CommonUtil;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Load and save project data from/to a ".dis65" file.
     /// 

SourceGen/ProjectProperties.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// A collection of project properties.
     /// 

SourceGen/Properties/AssemblyInfo.cs

@@ -7,11 +7,11 @@ using System.Windows;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SourceGenWPF")]
+[assembly: AssemblyTitle("SourceGen")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SourceGenWPF")]
+[assembly: AssemblyProduct("SourceGen")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

SourceGen/Properties/Resources.Designer.cs

@@ -8,9 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SourceGenWPF.Properties {
-
-
+namespace SourceGen.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -18,33 +19,33 @@ namespace SourceGenWPF.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
-
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if ((resourceMan == null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SourceGenWPF.Properties.Resources", typeof(Resources).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SourceGen.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.

SourceGen/Properties/Settings.Designer.cs

@@ -8,15 +8,15 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SourceGenWPF.Properties {
-
-
+namespace SourceGen.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
+        
         public static Settings Default {
             get {
                 return defaultInstance;

SourceGen/PseudoOp.cs

@@ -23,7 +23,7 @@ using System.Web.Script.Serialization;
 using Asm65;
 using CommonUtil;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Data pseudo-op formatter.  Long operands, notably strings and dense hex blocks, may
     /// be broken across multiple lines.

SourceGen/Res/CommandIcons.xaml

@@ -11,7 +11,7 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:SourceGenWPF.Res">
+                    xmlns:local="clr-namespace:SourceGen.Res">
 
     <!-- Fade the icon when the associated button is disabled.
     cf. https://stackoverflow.com/a/2530941/294248 -->

SourceGen/Res/Strings.xaml

@@ -19,7 +19,7 @@ limitations under the License.
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:local="clr-namespace:SourceGenWPF.Res">
+                    xmlns:local="clr-namespace:SourceGen.Res">
 
     <system:String x:Key="str_AbbrevAddress">Addr</system:String>
     <system:String x:Key="str_AbbrevConstant">Const</system:String>

SourceGen/Res/Strings.xaml.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Windows;
 
-namespace SourceGenWPF.Res {
+namespace SourceGen.Res {
     /// <summary>
     /// This is a bridge between the XAML definitions and the C# code that uses the strings.
     /// FindResource() throws an exception if the resource isn't found, so typos and missing

SourceGen/RuntimeDataAccess.cs

@@ -17,7 +17,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Facilitates access to the contents of the RuntimeData directory, which is located
     /// relative to the executable process pathname.

SourceGen/Sandbox/DomainManager.cs

@@ -22,7 +22,7 @@ using System.Security.Permissions;
 using System.Timers;
 using PluginCommon;
 
-namespace SourceGenWPF.Sandbox {
+namespace SourceGen.Sandbox {
     /// <summary>
     /// This is a host-side object that manages the plugin AppDomain.
     /// </summary>

SourceGen/Sandbox/PluginDllCache.cs

@@ -19,12 +19,11 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 
 using CommonUtil;
 using PluginCommon;
 
-namespace SourceGenWPF.Sandbox {
+namespace SourceGen.Sandbox {
     /// <summary>
     /// This manages the PluginDll directory, which holds the compiled form of the extension
     /// scripts.  When a script is requested, this checks to see if the compiled form

SourceGen/Sandbox/ScriptManager.cs

@@ -22,7 +22,7 @@ using System.Text;
 using CommonUtil;
 using PluginCommon;
 
-namespace SourceGenWPF.Sandbox {
+namespace SourceGen.Sandbox {
     /// <summary>
     /// Maintains a collection of IPlugin instances, or communicates with the remote
     /// PluginManager that holds the collection.  Whether the plugins are instantiated

SourceGen/Sandbox/Sponsor.cs

@@ -18,7 +18,7 @@ using System.Diagnostics;
 using System.Runtime.Remoting.Lifetime;
 using System.Security.Permissions;
 
-namespace SourceGenWPF.Sandbox {
+namespace SourceGen.Sandbox {
     /// <summary>
     /// This wraps a MarshalByRefObject instance with a "sponsor".  This
     /// is necessary because objects created by the host in the plugin

SourceGen/SourceGen.csproj

@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{30C35BBC-B9ED-4723-8F9D-597D51CCB13A}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>SourceGenWPF</RootNamespace>
-    <AssemblyName>SourceGenWPF</AssemblyName>
+    <RootNamespace>SourceGen</RootNamespace>
+    <AssemblyName>SourceGen</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

SourceGen/Symbol.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Diagnostics;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Symbolic representation of a value.  Instances are immutable.
     /// </summary>

SourceGen/SymbolTable.cs

@@ -20,7 +20,7 @@ using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// List of all symbols, arranged primarily by label, but also accessible by value.  All
     /// symbols have a unique label.

SourceGen/SystemDefaults.cs

@@ -19,7 +19,7 @@ using System.Diagnostics;
 
 using Asm65;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Helper functions for extracting values from a SystemDef instance.
     /// </summary>

SourceGen/SystemDefs.cs

@@ -23,7 +23,7 @@ using System.Web.Script.Serialization;
 
 using Asm65;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Target system definition, read from a config file.
     /// </summary>

SourceGen/Tests/GenTest.cs

@@ -22,9 +22,9 @@ using System.Text.RegularExpressions;
 using System.Windows.Media;
 
 using CommonUtil;
-using SourceGenWPF.AsmGen;
+using SourceGen.AsmGen;
 
-namespace SourceGenWPF.Tests {
+namespace SourceGen.Tests {
     /// <summary>
     /// Source code generation regression test.
     ///

SourceGen/Tests/ProgressMessage.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Windows.Media;
 
-namespace SourceGenWPF.Tests {
+namespace SourceGen.Tests {
     /// <summary>
     /// Progress message, with colorful text.  This is generated by the worker thread and
     /// passed to the UI thread.

SourceGen/Tests/WpfGui/GenTestRunner.xaml

@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.Tests.WpfGui.GenTestRunner"
+<Window x:Class="SourceGen.Tests.WpfGui.GenTestRunner"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        xmlns:local="clr-namespace:SourceGenWPF.Tests.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.Tests.WpfGui"
         mc:Ignorable="d"
         Title="Source Generation Test"
         Width="640" Height="480" MinWidth="640" MinHeight="480"

SourceGen/Tests/WpfGui/GenTestRunner.xaml.cs

@@ -26,7 +26,7 @@ using System.Windows.Media;
 
 using CommonWPF;
 
-namespace SourceGenWPF.Tests.WpfGui {
+namespace SourceGen.Tests.WpfGui {
     /// <summary>
     /// Source generation test runner.
     /// </summary>

SourceGen/Tools/VirtualHexDump.cs

@@ -15,17 +15,13 @@
  */
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using Asm65;
 
-namespace SourceGenWPF.Tools {
+namespace SourceGen.Tools {
     /// <summary>
     /// Generates formatted hex dump lines, and makes them available as a list.  The result
     /// is suitable for use with WPF ItemsSource.  Items are generated on demand, providing

SourceGen/Tools/WpfGui/AsciiChart.xaml

@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.Tools.WpfGui.AsciiChart"
+<Window x:Class="SourceGen.Tools.WpfGui.AsciiChart"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        xmlns:local="clr-namespace:SourceGenWPF.Tools.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.Tools.WpfGui"
         mc:Ignorable="d"
         Title="ASCII Chart"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/Tools/WpfGui/AsciiChart.xaml.cs

@@ -20,7 +20,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace SourceGenWPF.Tools.WpfGui {
+namespace SourceGen.Tools.WpfGui {
     /// <summary>
     /// ASCII chart.
     /// </summary>

SourceGen/Tools/WpfGui/HexDumpViewer.xaml

@@ -14,16 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.Tools.WpfGui.HexDumpViewer"
+<Window x:Class="SourceGen.Tools.WpfGui.HexDumpViewer"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Hex Dump Viewer"
-        Icon="/SourceGenWPF;component/Res/SourceGenIcon.ico"
         Width="542" Height="600" MinWidth="542" MinHeight="180"
         ShowInTaskbar="True"
         Loaded="Window_Loaded">

SourceGen/Tools/WpfGui/HexDumpViewer.xaml.cs

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 using System;
-using System.Collections;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
+
 using Asm65;
 
-namespace SourceGenWPF.Tools.WpfGui {
+namespace SourceGen.Tools.WpfGui {
     /// <summary>
     /// Hex dump viewer.
     /// </summary>

SourceGen/Tools/WpfGui/ShowText.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.Tools.WpfGui.ShowText"
+<Window x:Class="SourceGen.Tools.WpfGui.ShowText"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.Tools.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.Tools.WpfGui"
         mc:Ignorable="d"
         Title="(title)"
         Width="708" Height="500" MinWidth="100" MinHeight="100" ResizeMode="CanResizeWithGrip"

SourceGen/Tools/WpfGui/ShowText.xaml.cs

@@ -20,7 +20,7 @@ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Input;
 
-namespace SourceGenWPF.Tools.WpfGui {
+namespace SourceGen.Tools.WpfGui {
     /// <summary>
     /// Simple text display dialog.  Can be modal or modeless.
     /// </summary>

SourceGen/UndoableChange.cs

@@ -65,7 +65,7 @@ NOTE: all re-analysis requirements are symmetric for undo/redo.  Undoing a chang
 the same level of work as doing the change.
 */
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// A single change.
     /// </summary>

SourceGen/WeakSymbolRef.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Diagnostics;
 
-namespace SourceGenWPF {
+namespace SourceGen {
     /// <summary>
     /// Weak reference to a symbol for use in an operand or data statement.  The reference
     /// is by name; if the symbol disappears or changes value, the reference can be ignored.

SourceGen/WpfGui/AboutBox.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.AboutBox"
+<Window x:Class="SourceGen.WpfGui.AboutBox"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="About SourceGen"
         Width="720" Height="600" ResizeMode="NoResize"
@@ -38,7 +38,7 @@ limitations under the License.
         </Grid.RowDefinitions>
 
         <Image Grid.Column="0" Grid.Row="0"
-               Source="/SourceGenWPF;component/Res/Logo.png"/>
+               Source="/SourceGen;component/Res/Logo.png"/>
 
         <StackPanel Grid.Column="1" Grid.Row="0" Margin="8,12,0,0">
             <TextBlock Text="6502bench SourceGen" FontSize="30"/>

SourceGen/WpfGui/AboutBox.xaml.cs

@@ -17,7 +17,7 @@ using System;
 using System.IO;
 using System.Windows;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// "About" dialog.
     /// </summary>

SourceGen/WpfGui/DataFileLoadIssue.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.DataFileLoadIssue"
+<Window x:Class="SourceGen.WpfGui.DataFileLoadIssue"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Data File Load Issue"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/DataFileLoadIssue.xaml.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Windows;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Report a problem encountered while loading a data file.
     /// </summary>

SourceGen/WpfGui/DiscardChanges.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.DiscardChanges"
+<Window x:Class="SourceGen.WpfGui.DiscardChanges"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Discard Changes?"
         FocusManager.FocusedElement="{Binding ElementName=cancelButton}"

SourceGen/WpfGui/DiscardChanges.xaml.cs

@@ -16,7 +16,7 @@
 using System;
 using System.Windows;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Prompt the user before discarding changes.
     /// 

SourceGen/WpfGui/EditAddress.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditAddress"
+<Window x:Class="SourceGen.WpfGui.EditAddress"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Set Address"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/EditAddress.xaml.cs

@@ -20,7 +20,7 @@ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Edit Address dialog.
     /// </summary>

SourceGen/WpfGui/EditAppSettings.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditAppSettings"
+<Window x:Class="SourceGen.WpfGui.EditAppSettings"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Application Settings"
         Width="700" Height="440" ResizeMode="NoResize"

SourceGen/WpfGui/EditAppSettings.xaml.cs

@@ -26,11 +26,11 @@ using Microsoft.Win32;
 
 using CommonUtil;
 
-using AssemblerInfo = SourceGenWPF.AsmGen.AssemblerInfo;
-using AssemblerConfig = SourceGenWPF.AsmGen.AssemblerConfig;
+using AssemblerInfo = SourceGen.AsmGen.AssemblerInfo;
+using AssemblerConfig = SourceGen.AsmGen.AssemblerConfig;
 using ExpressionMode = Asm65.Formatter.FormatConfig.ExpressionMode;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Application settings dialog.
     /// </summary>

SourceGen/WpfGui/EditComment.xaml

@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditComment"
+<Window x:Class="SourceGen.WpfGui.EditComment"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Comment"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/EditComment.xaml.cs

@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Comment editor.
     /// </summary>

SourceGen/WpfGui/EditDataOperand.xaml

@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditDataOperand"
+<Window x:Class="SourceGen.WpfGui.EditDataOperand"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Data Operand"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/EditDataOperand.xaml.cs

@@ -18,13 +18,12 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 
 using CommonUtil;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Data operand editor.
     /// </summary>

SourceGen/WpfGui/EditDefSymbol.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditDefSymbol"
+<Window x:Class="SourceGen.WpfGui.EditDefSymbol"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Symbol"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/EditDefSymbol.xaml.cs

@@ -24,7 +24,7 @@ using System.Windows.Media;
 
 using Asm65;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Symbol edit dialog.
     /// </summary>

SourceGen/WpfGui/EditInstructionOperand.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditInstructionOperand"
+<Window x:Class="SourceGen.WpfGui.EditInstructionOperand"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Instruction Operand"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/EditInstructionOperand.xaml.cs

@@ -23,7 +23,7 @@ using System.Windows.Controls;
 
 using Asm65;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Instruction operand editor.
     /// 

SourceGen/WpfGui/EditLabel.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditLabel"
+<Window x:Class="SourceGen.WpfGui.EditLabel"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Label"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/EditLabel.xaml.cs

@@ -20,7 +20,7 @@ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Media;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Edit a label.
     /// </summary>

SourceGen/WpfGui/EditLongComment.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditLongComment"
+<Window x:Class="SourceGen.WpfGui.EditLongComment"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Long Comment"
         Width="584" Height="700" MinWidth="584" MinHeight="600" ResizeMode="CanResizeWithGrip"

SourceGen/WpfGui/EditLongComment.xaml.cs

@@ -23,7 +23,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Long comment editor.
     /// </summary>

SourceGen/WpfGui/EditNote.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditNote"
+<Window x:Class="SourceGen.WpfGui.EditNote"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Note"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"

SourceGen/WpfGui/EditNote.xaml.cs

@@ -18,13 +18,12 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Note editor.
     /// </summary>

SourceGen/WpfGui/EditProjectProperties.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditProjectProperties"
+<Window x:Class="SourceGen.WpfGui.EditProjectProperties"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Edit Project Properties"
         Width="600" Height="400" ResizeMode="NoResize"

SourceGen/WpfGui/EditProjectProperties.xaml.cs

@@ -30,7 +30,7 @@ using Asm65;
 using CommonUtil;
 using CommonWPF;
 
-namespace SourceGenWPF.WpfGui {
+namespace SourceGen.WpfGui {
     /// <summary>
     /// Project properties dialog.
     /// </summary>

SourceGen/WpfGui/EditStatusFlags.xaml

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.WpfGui.EditStatusFlags"
+<Window x:Class="SourceGen.WpfGui.EditStatusFlags"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
+        xmlns:local="clr-namespace:SourceGen.WpfGui"
         mc:Ignorable="d"
         Title="Override Status Flags"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"