diff --git a/SourceGenWPF/AddressMap.cs b/SourceGen/AddressMap.cs similarity index 99% rename from SourceGenWPF/AddressMap.cs rename to SourceGen/AddressMap.cs index e8e7c3f..47d36bb 100644 --- a/SourceGenWPF/AddressMap.cs +++ b/SourceGen/AddressMap.cs @@ -18,7 +18,7 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// Map file offsets to 65xx addresses and vice-versa. Useful for sources with /// multiple ORG directives. diff --git a/SourceGenWPF/Anattrib.cs b/SourceGen/Anattrib.cs similarity index 99% rename from SourceGenWPF/Anattrib.cs rename to SourceGen/Anattrib.cs index 9a45e9d..ad85e55 100644 --- a/SourceGenWPF/Anattrib.cs +++ b/SourceGen/Anattrib.cs @@ -19,7 +19,7 @@ using System.Text; using Asm65; -namespace SourceGenWPF { +namespace SourceGen { /// /// 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. diff --git a/SourceGenWPF/App.config b/SourceGen/App.config similarity index 100% rename from SourceGenWPF/App.config rename to SourceGen/App.config diff --git a/SourceGenWPF/App.xaml b/SourceGen/App.xaml similarity index 92% rename from SourceGenWPF/App.xaml rename to SourceGen/App.xaml index c9ee61f..debd7bd 100644 --- a/SourceGenWPF/App.xaml +++ b/SourceGen/App.xaml @@ -13,10 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/SourceGenWPF/App.xaml.cs b/SourceGen/App.xaml.cs similarity index 85% rename from SourceGenWPF/App.xaml.cs rename to SourceGen/App.xaml.cs index ac7a6d9..8a1e668 100644 --- a/SourceGenWPF/App.xaml.cs +++ b/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 { /// /// Interaction logic for App.xaml /// diff --git a/SourceGenWPF/AppSettings.cs b/SourceGen/AppSettings.cs similarity index 99% rename from SourceGenWPF/AppSettings.cs rename to SourceGen/AppSettings.cs index 7a6fcda..489cdd0 100644 --- a/SourceGenWPF/AppSettings.cs +++ b/SourceGen/AppSettings.cs @@ -19,7 +19,7 @@ using System.Diagnostics; using System.Text; using System.Web.Script.Serialization; -namespace SourceGenWPF { +namespace SourceGen { /// /// Application settings registry. This holds both user-accessible settings and saved /// values like window widths. diff --git a/SourceGenWPF/AsmGen/AsmCc65.cs b/SourceGen/AsmGen/AsmCc65.cs similarity index 99% rename from SourceGenWPF/AsmGen/AsmCc65.cs rename to SourceGen/AsmGen/AsmCc65.cs index 3a1338a..4ae2007 100644 --- a/SourceGenWPF/AsmGen/AsmCc65.cs +++ b/SourceGen/AsmGen/AsmCc65.cs @@ -23,7 +23,7 @@ using System.Text; using Asm65; using CommonUtil; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { #region IGenerator /// diff --git a/SourceGenWPF/AsmGen/AsmMerlin32.cs b/SourceGen/AsmGen/AsmMerlin32.cs similarity index 99% rename from SourceGenWPF/AsmGen/AsmMerlin32.cs rename to SourceGen/AsmGen/AsmMerlin32.cs index 8d18c6b..5b6c933 100644 --- a/SourceGenWPF/AsmGen/AsmMerlin32.cs +++ b/SourceGen/AsmGen/AsmMerlin32.cs @@ -23,7 +23,7 @@ using System.Text; using Asm65; using CommonUtil; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { #region IGenerator /// diff --git a/SourceGenWPF/AsmGen/AsmTass64.cs b/SourceGen/AsmGen/AsmTass64.cs similarity index 99% rename from SourceGenWPF/AsmGen/AsmTass64.cs rename to SourceGen/AsmGen/AsmTass64.cs index 0e8af7f..7c3cc38 100644 --- a/SourceGenWPF/AsmGen/AsmTass64.cs +++ b/SourceGen/AsmGen/AsmTass64.cs @@ -23,7 +23,7 @@ using System.Text; using Asm65; using CommonUtil; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { #region IGenerator /// diff --git a/SourceGenWPF/AsmGen/AssemblerConfig.cs b/SourceGen/AsmGen/AssemblerConfig.cs similarity index 99% rename from SourceGenWPF/AsmGen/AssemblerConfig.cs rename to SourceGen/AsmGen/AssemblerConfig.cs index 4dd2527..bc6a21c 100644 --- a/SourceGenWPF/AsmGen/AssemblerConfig.cs +++ b/SourceGen/AsmGen/AssemblerConfig.cs @@ -17,7 +17,7 @@ using System; using System.Diagnostics; using System.Web.Script.Serialization; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { /// /// Assembler configuration holder. Serializes and deserializes information held in /// application settings. diff --git a/SourceGenWPF/AsmGen/AssemblerInfo.cs b/SourceGen/AsmGen/AssemblerInfo.cs similarity index 99% rename from SourceGenWPF/AsmGen/AssemblerInfo.cs rename to SourceGen/AsmGen/AssemblerInfo.cs index 40e5ea9..39a6144 100644 --- a/SourceGenWPF/AsmGen/AssemblerInfo.cs +++ b/SourceGen/AsmGen/AssemblerInfo.cs @@ -18,7 +18,7 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { /// /// Static information on assemblers supported by SourceGen. This is relevant for both /// assembly source generation and assembler execution. Nothing here is affected diff --git a/SourceGenWPF/AsmGen/AssemblerVersion.cs b/SourceGen/AsmGen/AssemblerVersion.cs similarity index 99% rename from SourceGenWPF/AsmGen/AssemblerVersion.cs rename to SourceGen/AsmGen/AssemblerVersion.cs index 89f6b5e..ef17f86 100644 --- a/SourceGenWPF/AsmGen/AssemblerVersion.cs +++ b/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 { /// /// Version string reported by the assembler. Retained mostly for debugging. diff --git a/SourceGenWPF/AsmGen/GenCommon.cs b/SourceGen/AsmGen/GenCommon.cs similarity index 99% rename from SourceGenWPF/AsmGen/GenCommon.cs rename to SourceGen/AsmGen/GenCommon.cs index 8b7ed1c..798850a 100644 --- a/SourceGenWPF/AsmGen/GenCommon.cs +++ b/SourceGen/AsmGen/GenCommon.cs @@ -21,7 +21,7 @@ using System.IO; using Asm65; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { public class GenCommon { /// /// Generates assembly source. diff --git a/SourceGenWPF/AsmGen/IAssembler.cs b/SourceGen/AsmGen/IAssembler.cs similarity index 99% rename from SourceGenWPF/AsmGen/IAssembler.cs rename to SourceGen/AsmGen/IAssembler.cs index 9d6ec40..309bb9a 100644 --- a/SourceGenWPF/AsmGen/IAssembler.cs +++ b/SourceGen/AsmGen/IAssembler.cs @@ -17,7 +17,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { /// /// Common interface for executing assemblers. /// diff --git a/SourceGenWPF/AsmGen/IGenerator.cs b/SourceGen/AsmGen/IGenerator.cs similarity index 99% rename from SourceGenWPF/AsmGen/IGenerator.cs rename to SourceGen/AsmGen/IGenerator.cs index ac207e0..55ce419 100644 --- a/SourceGenWPF/AsmGen/IGenerator.cs +++ b/SourceGen/AsmGen/IGenerator.cs @@ -19,7 +19,7 @@ using System.ComponentModel; using Asm65; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { /// /// Common interface for generating assembler-specific source code. /// diff --git a/SourceGenWPF/AsmGen/LabelLocalizer.cs b/SourceGen/AsmGen/LabelLocalizer.cs similarity index 99% rename from SourceGenWPF/AsmGen/LabelLocalizer.cs rename to SourceGen/AsmGen/LabelLocalizer.cs index adb29a7..bbf33fb 100644 --- a/SourceGenWPF/AsmGen/LabelLocalizer.cs +++ b/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 { /// /// A pairing of an offset with a label string. (Essentially mAnattribs[n].Symbol diff --git a/SourceGenWPF/AsmGen/StringGather.cs b/SourceGen/AsmGen/StringGather.cs similarity index 99% rename from SourceGenWPF/AsmGen/StringGather.cs rename to SourceGen/AsmGen/StringGather.cs index cb3498f..5be7085 100644 --- a/SourceGenWPF/AsmGen/StringGather.cs +++ b/SourceGen/AsmGen/StringGather.cs @@ -16,7 +16,7 @@ using System; using System.Diagnostics; -namespace SourceGenWPF.AsmGen { +namespace SourceGen.AsmGen { /// /// Multi-line string gatherer. Accumulates characters and raw bytes, emitting /// them when we have a full operand's worth. diff --git a/SourceGenWPF/AsmGen/WpfGui/GenAndAsm.xaml b/SourceGen/AsmGen/WpfGui/GenAndAsm.xaml similarity index 97% rename from SourceGenWPF/AsmGen/WpfGui/GenAndAsm.xaml rename to SourceGen/AsmGen/WpfGui/GenAndAsm.xaml index 7d3ed4a..191eec0 100644 --- a/SourceGenWPF/AsmGen/WpfGui/GenAndAsm.xaml +++ b/SourceGen/AsmGen/WpfGui/GenAndAsm.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Code generation and assembler execution dialog. /// diff --git a/SourceGenWPF/AutoLabel.cs b/SourceGen/AutoLabel.cs similarity index 99% rename from SourceGenWPF/AutoLabel.cs rename to SourceGen/AutoLabel.cs index 7ef49d0..821037f 100644 --- a/SourceGenWPF/AutoLabel.cs +++ b/SourceGen/AutoLabel.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// Functions for generation of "auto" labels. /// diff --git a/SourceGenWPF/ChangeSet.cs b/SourceGen/ChangeSet.cs similarity index 99% rename from SourceGenWPF/ChangeSet.cs rename to SourceGen/ChangeSet.cs index 1a924c7..64f7881 100644 --- a/SourceGenWPF/ChangeSet.cs +++ b/SourceGen/ChangeSet.cs @@ -18,7 +18,7 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// Holds information about a set of changes. /// diff --git a/SourceGenWPF/CodeAnalysis.cs b/SourceGen/CodeAnalysis.cs similarity index 99% rename from SourceGenWPF/CodeAnalysis.cs rename to SourceGen/CodeAnalysis.cs index a04901f..80ace29 100644 --- a/SourceGenWPF/CodeAnalysis.cs +++ b/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 { /// /// Instruction analyzer. /// diff --git a/SourceGenWPF/DataAnalysis.cs b/SourceGen/DataAnalysis.cs similarity index 99% rename from SourceGenWPF/DataAnalysis.cs rename to SourceGen/DataAnalysis.cs index 1097662..f324b22 100644 --- a/SourceGenWPF/DataAnalysis.cs +++ b/SourceGen/DataAnalysis.cs @@ -19,7 +19,7 @@ using System.Diagnostics; using Asm65; using CommonUtil; -namespace SourceGenWPF { +namespace SourceGen { /// /// Auto-detection of structured data. /// diff --git a/SourceGenWPF/DefSymbol.cs b/SourceGen/DefSymbol.cs similarity index 99% rename from SourceGenWPF/DefSymbol.cs rename to SourceGen/DefSymbol.cs index 9ea750d..daa07a8 100644 --- a/SourceGenWPF/DefSymbol.cs +++ b/SourceGen/DefSymbol.cs @@ -17,7 +17,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// Subclass of Symbol used for symbols defined in the platform or project. /// diff --git a/SourceGenWPF/DisasmProject.cs b/SourceGen/DisasmProject.cs similarity index 99% rename from SourceGenWPF/DisasmProject.cs rename to SourceGen/DisasmProject.cs index 47cb82f..b505d86 100644 --- a/SourceGenWPF/DisasmProject.cs +++ b/SourceGen/DisasmProject.cs @@ -21,9 +21,9 @@ using System.Text; using Asm65; using CommonUtil; -using SourceGenWPF.Sandbox; +using SourceGen.Sandbox; -namespace SourceGenWPF { +namespace SourceGen { /// /// All state for an open project. /// diff --git a/SourceGenWPF/DisplayList.cs b/SourceGen/DisplayList.cs similarity index 99% rename from SourceGenWPF/DisplayList.cs rename to SourceGen/DisplayList.cs index 57877fa..56ce2d8 100644 --- a/SourceGenWPF/DisplayList.cs +++ b/SourceGen/DisplayList.cs @@ -21,7 +21,7 @@ using System.Diagnostics; using System.ComponentModel; using System.Windows.Media; -namespace SourceGenWPF { +namespace SourceGen { /// /// List of items formatted for display. /// diff --git a/SourceGenWPF/DisplayListSelection.cs b/SourceGen/DisplayListSelection.cs similarity index 99% rename from SourceGenWPF/DisplayListSelection.cs rename to SourceGen/DisplayListSelection.cs index 25dd4bf..c974830 100644 --- a/SourceGenWPF/DisplayListSelection.cs +++ b/SourceGen/DisplayListSelection.cs @@ -21,7 +21,7 @@ using System.Windows.Controls; using CommonUtil; -namespace SourceGenWPF { +namespace SourceGen { /// /// Tracks the items selected in the DisplayList, using forwarded SelectionChanged events. /// When enumerated, provides an ordered list of selected indices. diff --git a/SourceGenWPF/ExternalFile.cs b/SourceGen/ExternalFile.cs similarity index 99% rename from SourceGenWPF/ExternalFile.cs rename to SourceGen/ExternalFile.cs index 3d06f20..da8f8e9 100644 --- a/SourceGenWPF/ExternalFile.cs +++ b/SourceGen/ExternalFile.cs @@ -17,7 +17,7 @@ using System; using System.Diagnostics; using System.IO; -namespace SourceGenWPF { +namespace SourceGen { /// /// Manages references to external files, notably symbol files (.sym65) and extension /// scripts. Identifiers look like "RT:subdir/file.sym65". diff --git a/SourceGenWPF/FormatDescriptor.cs b/SourceGen/FormatDescriptor.cs similarity index 99% rename from SourceGenWPF/FormatDescriptor.cs rename to SourceGen/FormatDescriptor.cs index 9b11431..61e2450 100644 --- a/SourceGenWPF/FormatDescriptor.cs +++ b/SourceGen/FormatDescriptor.cs @@ -17,7 +17,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// Format descriptor for data items and instruction operands. Instances are immutable. /// diff --git a/SourceGenWPF/HelpAccess.cs b/SourceGen/HelpAccess.cs similarity index 99% rename from SourceGenWPF/HelpAccess.cs rename to SourceGen/HelpAccess.cs index ca7dd07..3c5ad48 100644 --- a/SourceGenWPF/HelpAccess.cs +++ b/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 { /// /// Help viewer API. /// diff --git a/SourceGenWPF/LineListGen.cs b/SourceGen/LineListGen.cs similarity index 99% rename from SourceGenWPF/LineListGen.cs rename to SourceGen/LineListGen.cs index 79f62a1..5c4a043 100644 --- a/SourceGenWPF/LineListGen.cs +++ b/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 { /// /// Converts file data and Anattrib contents into a series of strings and format metadata. /// diff --git a/SourceGenWPF/MainController.cs b/SourceGen/MainController.cs similarity index 99% rename from SourceGenWPF/MainController.cs rename to SourceGen/MainController.cs index 80e909f..c39648a 100644 --- a/SourceGenWPF/MainController.cs +++ b/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 { /// /// 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 diff --git a/SourceGenWPF/MultiLineComment.cs b/SourceGen/MultiLineComment.cs similarity index 99% rename from SourceGenWPF/MultiLineComment.cs rename to SourceGen/MultiLineComment.cs index 8032b11..aac2f11 100644 --- a/SourceGenWPF/MultiLineComment.cs +++ b/SourceGen/MultiLineComment.cs @@ -19,7 +19,7 @@ using System.Diagnostics; using System.Windows.Media; using System.Text; -namespace SourceGenWPF { +namespace SourceGen { /// /// Representation of a multi-line comment, which is a string plus some format directives. /// Used for long comments and notes. diff --git a/SourceGenWPF/NavStack.cs b/SourceGen/NavStack.cs similarity index 99% rename from SourceGenWPF/NavStack.cs rename to SourceGen/NavStack.cs index ef046be..43cdff8 100644 --- a/SourceGenWPF/NavStack.cs +++ b/SourceGen/NavStack.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text; -namespace SourceGenWPF { +namespace SourceGen { /// /// Maintains a record of interesting places we've been. /// diff --git a/SourceGenWPF/PlatformSymbols.cs b/SourceGen/PlatformSymbols.cs similarity index 99% rename from SourceGenWPF/PlatformSymbols.cs rename to SourceGen/PlatformSymbols.cs index 57663ac..109e1af 100644 --- a/SourceGenWPF/PlatformSymbols.cs +++ b/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 { /// /// Loads and maintains a collection of platform-specific symbols from a ".sym65" file. /// diff --git a/SourceGenWPF/ProjectFile.cs b/SourceGen/ProjectFile.cs similarity index 99% rename from SourceGenWPF/ProjectFile.cs rename to SourceGen/ProjectFile.cs index cf67682..2f3f4e1 100644 --- a/SourceGenWPF/ProjectFile.cs +++ b/SourceGen/ProjectFile.cs @@ -23,7 +23,7 @@ using System.Windows.Media; using CommonUtil; -namespace SourceGenWPF { +namespace SourceGen { /// /// Load and save project data from/to a ".dis65" file. /// diff --git a/SourceGenWPF/ProjectProperties.cs b/SourceGen/ProjectProperties.cs similarity index 99% rename from SourceGenWPF/ProjectProperties.cs rename to SourceGen/ProjectProperties.cs index 98c7568..c1736e3 100644 --- a/SourceGenWPF/ProjectProperties.cs +++ b/SourceGen/ProjectProperties.cs @@ -16,7 +16,7 @@ using System; using System.Collections.Generic; -namespace SourceGenWPF { +namespace SourceGen { /// /// A collection of project properties. /// diff --git a/SourceGenWPF/Properties/AssemblyInfo.cs b/SourceGen/Properties/AssemblyInfo.cs similarity index 96% rename from SourceGenWPF/Properties/AssemblyInfo.cs rename to SourceGen/Properties/AssemblyInfo.cs index a7d02e7..4d74575 100644 --- a/SourceGenWPF/Properties/AssemblyInfo.cs +++ b/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("")] diff --git a/SourceGenWPF/Properties/Resources.Designer.cs b/SourceGen/Properties/Resources.Designer.cs similarity index 87% rename from SourceGenWPF/Properties/Resources.Designer.cs rename to SourceGen/Properties/Resources.Designer.cs index 6865374..fbfd35e 100644 --- a/SourceGenWPF/Properties/Resources.Designer.cs +++ b/SourceGen/Properties/Resources.Designer.cs @@ -8,9 +8,10 @@ // //------------------------------------------------------------------------------ -namespace SourceGenWPF.Properties { - - +namespace SourceGen.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -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() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [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; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. diff --git a/SourceGenWPF/Properties/Resources.resx b/SourceGen/Properties/Resources.resx similarity index 100% rename from SourceGenWPF/Properties/Resources.resx rename to SourceGen/Properties/Resources.resx diff --git a/SourceGenWPF/Properties/Settings.Designer.cs b/SourceGen/Properties/Settings.Designer.cs similarity index 92% rename from SourceGenWPF/Properties/Settings.Designer.cs rename to SourceGen/Properties/Settings.Designer.cs index be59f34..f6b44ab 100644 --- a/SourceGenWPF/Properties/Settings.Designer.cs +++ b/SourceGen/Properties/Settings.Designer.cs @@ -8,15 +8,15 @@ // //------------------------------------------------------------------------------ -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; diff --git a/SourceGenWPF/Properties/Settings.settings b/SourceGen/Properties/Settings.settings similarity index 100% rename from SourceGenWPF/Properties/Settings.settings rename to SourceGen/Properties/Settings.settings diff --git a/SourceGenWPF/PseudoOp.cs b/SourceGen/PseudoOp.cs similarity index 99% rename from SourceGenWPF/PseudoOp.cs rename to SourceGen/PseudoOp.cs index 419cfe0..36d0c02 100644 --- a/SourceGenWPF/PseudoOp.cs +++ b/SourceGen/PseudoOp.cs @@ -23,7 +23,7 @@ using System.Web.Script.Serialization; using Asm65; using CommonUtil; -namespace SourceGenWPF { +namespace SourceGen { /// /// Data pseudo-op formatter. Long operands, notably strings and dense hex blocks, may /// be broken across multiple lines. diff --git a/SourceGenWPF/Res/AboutImage.png b/SourceGen/Res/AboutImage.png similarity index 100% rename from SourceGenWPF/Res/AboutImage.png rename to SourceGen/Res/AboutImage.png diff --git a/SourceGenWPF/Res/CommandIcons.xaml b/SourceGen/Res/CommandIcons.xaml similarity index 99% rename from SourceGenWPF/Res/CommandIcons.xaml rename to SourceGen/Res/CommandIcons.xaml index 5d5c424..bb417d3 100644 --- a/SourceGenWPF/Res/CommandIcons.xaml +++ b/SourceGen/Res/CommandIcons.xaml @@ -11,7 +11,7 @@ + xmlns:local="clr-namespace:SourceGen.Res"> diff --git a/SourceGenWPF/Res/Logo.png b/SourceGen/Res/Logo.png similarity index 100% rename from SourceGenWPF/Res/Logo.png rename to SourceGen/Res/Logo.png diff --git a/SourceGenWPF/Res/SourceGenIcon.ico b/SourceGen/Res/SourceGenIcon.ico similarity index 100% rename from SourceGenWPF/Res/SourceGenIcon.ico rename to SourceGen/Res/SourceGenIcon.ico diff --git a/SourceGenWPF/Res/Strings.xaml b/SourceGen/Res/Strings.xaml similarity index 99% rename from SourceGenWPF/Res/Strings.xaml rename to SourceGen/Res/Strings.xaml index f7dc7d8..faa0586 100644 --- a/SourceGenWPF/Res/Strings.xaml +++ b/SourceGen/Res/Strings.xaml @@ -19,7 +19,7 @@ limitations under the License. + xmlns:local="clr-namespace:SourceGen.Res"> Addr Const diff --git a/SourceGenWPF/Res/Strings.xaml.cs b/SourceGen/Res/Strings.xaml.cs similarity index 99% rename from SourceGenWPF/Res/Strings.xaml.cs rename to SourceGen/Res/Strings.xaml.cs index 64287c1..5a9d167 100644 --- a/SourceGenWPF/Res/Strings.xaml.cs +++ b/SourceGen/Res/Strings.xaml.cs @@ -16,7 +16,7 @@ using System; using System.Windows; -namespace SourceGenWPF.Res { +namespace SourceGen.Res { /// /// 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 diff --git a/SourceGenWPF/RuntimeDataAccess.cs b/SourceGen/RuntimeDataAccess.cs similarity index 99% rename from SourceGenWPF/RuntimeDataAccess.cs rename to SourceGen/RuntimeDataAccess.cs index 9c7acc8..f42e659 100644 --- a/SourceGenWPF/RuntimeDataAccess.cs +++ b/SourceGen/RuntimeDataAccess.cs @@ -17,7 +17,7 @@ using System; using System.Diagnostics; using System.IO; -namespace SourceGenWPF { +namespace SourceGen { /// /// Facilitates access to the contents of the RuntimeData directory, which is located /// relative to the executable process pathname. diff --git a/SourceGenWPF/Sandbox/DomainManager.cs b/SourceGen/Sandbox/DomainManager.cs similarity index 99% rename from SourceGenWPF/Sandbox/DomainManager.cs rename to SourceGen/Sandbox/DomainManager.cs index fbac1dc..a871dc3 100644 --- a/SourceGenWPF/Sandbox/DomainManager.cs +++ b/SourceGen/Sandbox/DomainManager.cs @@ -22,7 +22,7 @@ using System.Security.Permissions; using System.Timers; using PluginCommon; -namespace SourceGenWPF.Sandbox { +namespace SourceGen.Sandbox { /// /// This is a host-side object that manages the plugin AppDomain. /// diff --git a/SourceGenWPF/Sandbox/PluginDllCache.cs b/SourceGen/Sandbox/PluginDllCache.cs similarity index 99% rename from SourceGenWPF/Sandbox/PluginDllCache.cs rename to SourceGen/Sandbox/PluginDllCache.cs index 162a409..e45bc99 100644 --- a/SourceGenWPF/Sandbox/PluginDllCache.cs +++ b/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 { /// /// 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 diff --git a/SourceGenWPF/Sandbox/ScriptManager.cs b/SourceGen/Sandbox/ScriptManager.cs similarity index 99% rename from SourceGenWPF/Sandbox/ScriptManager.cs rename to SourceGen/Sandbox/ScriptManager.cs index d0dc254..4f56794 100644 --- a/SourceGenWPF/Sandbox/ScriptManager.cs +++ b/SourceGen/Sandbox/ScriptManager.cs @@ -22,7 +22,7 @@ using System.Text; using CommonUtil; using PluginCommon; -namespace SourceGenWPF.Sandbox { +namespace SourceGen.Sandbox { /// /// Maintains a collection of IPlugin instances, or communicates with the remote /// PluginManager that holds the collection. Whether the plugins are instantiated diff --git a/SourceGenWPF/Sandbox/Sponsor.cs b/SourceGen/Sandbox/Sponsor.cs similarity index 99% rename from SourceGenWPF/Sandbox/Sponsor.cs rename to SourceGen/Sandbox/Sponsor.cs index 584089c..88422f4 100644 --- a/SourceGenWPF/Sandbox/Sponsor.cs +++ b/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 { /// /// This wraps a MarshalByRefObject instance with a "sponsor". This /// is necessary because objects created by the host in the plugin diff --git a/SourceGenWPF/SourceGenWPF.csproj b/SourceGen/SourceGen.csproj similarity index 99% rename from SourceGenWPF/SourceGenWPF.csproj rename to SourceGen/SourceGen.csproj index 0b47d59..f477fb0 100644 --- a/SourceGenWPF/SourceGenWPF.csproj +++ b/SourceGen/SourceGen.csproj @@ -6,8 +6,8 @@ AnyCPU {30C35BBC-B9ED-4723-8F9D-597D51CCB13A} WinExe - SourceGenWPF - SourceGenWPF + SourceGen + SourceGen v4.6.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/SourceGenWPF/Symbol.cs b/SourceGen/Symbol.cs similarity index 99% rename from SourceGenWPF/Symbol.cs rename to SourceGen/Symbol.cs index 1798a9e..38f1dc8 100644 --- a/SourceGenWPF/Symbol.cs +++ b/SourceGen/Symbol.cs @@ -16,7 +16,7 @@ using System; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// Symbolic representation of a value. Instances are immutable. /// diff --git a/SourceGenWPF/SymbolTable.cs b/SourceGen/SymbolTable.cs similarity index 99% rename from SourceGenWPF/SymbolTable.cs rename to SourceGen/SymbolTable.cs index ce11048..29d3759 100644 --- a/SourceGenWPF/SymbolTable.cs +++ b/SourceGen/SymbolTable.cs @@ -20,7 +20,7 @@ using System.Diagnostics; using System.Linq; using System.Text; -namespace SourceGenWPF { +namespace SourceGen { /// /// List of all symbols, arranged primarily by label, but also accessible by value. All /// symbols have a unique label. diff --git a/SourceGenWPF/SystemDefaults.cs b/SourceGen/SystemDefaults.cs similarity index 99% rename from SourceGenWPF/SystemDefaults.cs rename to SourceGen/SystemDefaults.cs index ba43405..f63c2b7 100644 --- a/SourceGenWPF/SystemDefaults.cs +++ b/SourceGen/SystemDefaults.cs @@ -19,7 +19,7 @@ using System.Diagnostics; using Asm65; -namespace SourceGenWPF { +namespace SourceGen { /// /// Helper functions for extracting values from a SystemDef instance. /// diff --git a/SourceGenWPF/SystemDefs.cs b/SourceGen/SystemDefs.cs similarity index 99% rename from SourceGenWPF/SystemDefs.cs rename to SourceGen/SystemDefs.cs index c4f69c4..8c79bd0 100644 --- a/SourceGenWPF/SystemDefs.cs +++ b/SourceGen/SystemDefs.cs @@ -23,7 +23,7 @@ using System.Web.Script.Serialization; using Asm65; -namespace SourceGenWPF { +namespace SourceGen { /// /// Target system definition, read from a config file. /// diff --git a/SourceGenWPF/Tests/GenTest.cs b/SourceGen/Tests/GenTest.cs similarity index 99% rename from SourceGenWPF/Tests/GenTest.cs rename to SourceGen/Tests/GenTest.cs index 97c833d..7224ba2 100644 --- a/SourceGenWPF/Tests/GenTest.cs +++ b/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 { /// /// Source code generation regression test. /// diff --git a/SourceGenWPF/Tests/ProgressMessage.cs b/SourceGen/Tests/ProgressMessage.cs similarity index 97% rename from SourceGenWPF/Tests/ProgressMessage.cs rename to SourceGen/Tests/ProgressMessage.cs index 3ba75bd..91fe5d2 100644 --- a/SourceGenWPF/Tests/ProgressMessage.cs +++ b/SourceGen/Tests/ProgressMessage.cs @@ -16,7 +16,7 @@ using System; using System.Windows.Media; -namespace SourceGenWPF.Tests { +namespace SourceGen.Tests { /// /// Progress message, with colorful text. This is generated by the worker thread and /// passed to the UI thread. diff --git a/SourceGenWPF/Tests/WpfGui/GenTestRunner.xaml b/SourceGen/Tests/WpfGui/GenTestRunner.xaml similarity index 95% rename from SourceGenWPF/Tests/WpfGui/GenTestRunner.xaml rename to SourceGen/Tests/WpfGui/GenTestRunner.xaml index e00f739..71268f0 100644 --- a/SourceGenWPF/Tests/WpfGui/GenTestRunner.xaml +++ b/SourceGen/Tests/WpfGui/GenTestRunner.xaml @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Source generation test runner. /// diff --git a/SourceGenWPF/Tools/VirtualHexDump.cs b/SourceGen/Tools/VirtualHexDump.cs similarity index 98% rename from SourceGenWPF/Tools/VirtualHexDump.cs rename to SourceGen/Tools/VirtualHexDump.cs index f7b3218..08e608d 100644 --- a/SourceGenWPF/Tools/VirtualHexDump.cs +++ b/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 { /// /// 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 diff --git a/SourceGenWPF/Tools/WpfGui/AsciiChart.xaml b/SourceGen/Tools/WpfGui/AsciiChart.xaml similarity index 94% rename from SourceGenWPF/Tools/WpfGui/AsciiChart.xaml rename to SourceGen/Tools/WpfGui/AsciiChart.xaml index f40e181..6fdd949 100644 --- a/SourceGenWPF/Tools/WpfGui/AsciiChart.xaml +++ b/SourceGen/Tools/WpfGui/AsciiChart.xaml @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// ASCII chart. /// diff --git a/SourceGenWPF/Tools/WpfGui/HexDumpViewer.xaml b/SourceGen/Tools/WpfGui/HexDumpViewer.xaml similarity index 94% rename from SourceGenWPF/Tools/WpfGui/HexDumpViewer.xaml rename to SourceGen/Tools/WpfGui/HexDumpViewer.xaml index d207f98..0d97fa7 100644 --- a/SourceGenWPF/Tools/WpfGui/HexDumpViewer.xaml +++ b/SourceGen/Tools/WpfGui/HexDumpViewer.xaml @@ -14,16 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. --> - diff --git a/SourceGenWPF/Tools/WpfGui/HexDumpViewer.xaml.cs b/SourceGen/Tools/WpfGui/HexDumpViewer.xaml.cs similarity index 98% rename from SourceGenWPF/Tools/WpfGui/HexDumpViewer.xaml.cs rename to SourceGen/Tools/WpfGui/HexDumpViewer.xaml.cs index de21459..69f54d1 100644 --- a/SourceGenWPF/Tools/WpfGui/HexDumpViewer.xaml.cs +++ b/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 { /// /// Hex dump viewer. /// diff --git a/SourceGenWPF/Tools/WpfGui/ShowText.xaml b/SourceGen/Tools/WpfGui/ShowText.xaml similarity index 92% rename from SourceGenWPF/Tools/WpfGui/ShowText.xaml rename to SourceGen/Tools/WpfGui/ShowText.xaml index 1805e0f..d92cfd4 100644 --- a/SourceGenWPF/Tools/WpfGui/ShowText.xaml +++ b/SourceGen/Tools/WpfGui/ShowText.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Simple text display dialog. Can be modal or modeless. /// diff --git a/SourceGenWPF/UndoableChange.cs b/SourceGen/UndoableChange.cs similarity index 99% rename from SourceGenWPF/UndoableChange.cs rename to SourceGen/UndoableChange.cs index d24fbbc..bc03861 100644 --- a/SourceGenWPF/UndoableChange.cs +++ b/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 { /// /// A single change. /// diff --git a/SourceGenWPF/WeakSymbolRef.cs b/SourceGen/WeakSymbolRef.cs similarity index 99% rename from SourceGenWPF/WeakSymbolRef.cs rename to SourceGen/WeakSymbolRef.cs index a0d2c22..fe19b9a 100644 --- a/SourceGenWPF/WeakSymbolRef.cs +++ b/SourceGen/WeakSymbolRef.cs @@ -16,7 +16,7 @@ using System; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// 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. diff --git a/SourceGenWPF/WpfGui/AboutBox.xaml b/SourceGen/WpfGui/AboutBox.xaml similarity index 94% rename from SourceGenWPF/WpfGui/AboutBox.xaml rename to SourceGen/WpfGui/AboutBox.xaml index c7e2d76..01536a3 100644 --- a/SourceGenWPF/WpfGui/AboutBox.xaml +++ b/SourceGen/WpfGui/AboutBox.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - + Source="/SourceGen;component/Res/Logo.png"/> diff --git a/SourceGenWPF/WpfGui/AboutBox.xaml.cs b/SourceGen/WpfGui/AboutBox.xaml.cs similarity index 98% rename from SourceGenWPF/WpfGui/AboutBox.xaml.cs rename to SourceGen/WpfGui/AboutBox.xaml.cs index e1928d7..afc144c 100644 --- a/SourceGenWPF/WpfGui/AboutBox.xaml.cs +++ b/SourceGen/WpfGui/AboutBox.xaml.cs @@ -17,7 +17,7 @@ using System; using System.IO; using System.Windows; -namespace SourceGenWPF.WpfGui { +namespace SourceGen.WpfGui { /// /// "About" dialog. /// diff --git a/SourceGenWPF/WpfGui/CodeListItemStyle.xaml b/SourceGen/WpfGui/CodeListItemStyle.xaml similarity index 100% rename from SourceGenWPF/WpfGui/CodeListItemStyle.xaml rename to SourceGen/WpfGui/CodeListItemStyle.xaml diff --git a/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml b/SourceGen/WpfGui/DataFileLoadIssue.xaml similarity index 94% rename from SourceGenWPF/WpfGui/DataFileLoadIssue.xaml rename to SourceGen/WpfGui/DataFileLoadIssue.xaml index 25c36c7..63a252e 100644 --- a/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml +++ b/SourceGen/WpfGui/DataFileLoadIssue.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Report a problem encountered while loading a data file. /// diff --git a/SourceGenWPF/WpfGui/DiscardChanges.xaml b/SourceGen/WpfGui/DiscardChanges.xaml similarity index 94% rename from SourceGenWPF/WpfGui/DiscardChanges.xaml rename to SourceGen/WpfGui/DiscardChanges.xaml index 441b604..d8d8cd3 100644 --- a/SourceGenWPF/WpfGui/DiscardChanges.xaml +++ b/SourceGen/WpfGui/DiscardChanges.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Prompt the user before discarding changes. /// diff --git a/SourceGenWPF/WpfGui/EditAddress.xaml b/SourceGen/WpfGui/EditAddress.xaml similarity index 96% rename from SourceGenWPF/WpfGui/EditAddress.xaml rename to SourceGen/WpfGui/EditAddress.xaml index a4937c5..6d78384 100644 --- a/SourceGenWPF/WpfGui/EditAddress.xaml +++ b/SourceGen/WpfGui/EditAddress.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Edit Address dialog. /// diff --git a/SourceGenWPF/WpfGui/EditAppSettings.xaml b/SourceGen/WpfGui/EditAppSettings.xaml similarity index 99% rename from SourceGenWPF/WpfGui/EditAppSettings.xaml rename to SourceGen/WpfGui/EditAppSettings.xaml index 42c251c..2f77b10 100644 --- a/SourceGenWPF/WpfGui/EditAppSettings.xaml +++ b/SourceGen/WpfGui/EditAppSettings.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Application settings dialog. /// diff --git a/SourceGenWPF/WpfGui/EditComment.xaml b/SourceGen/WpfGui/EditComment.xaml similarity index 95% rename from SourceGenWPF/WpfGui/EditComment.xaml rename to SourceGen/WpfGui/EditComment.xaml index 24e9991..33cccd6 100644 --- a/SourceGenWPF/WpfGui/EditComment.xaml +++ b/SourceGen/WpfGui/EditComment.xaml @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Comment editor. /// diff --git a/SourceGenWPF/WpfGui/EditDataOperand.xaml b/SourceGen/WpfGui/EditDataOperand.xaml similarity index 98% rename from SourceGenWPF/WpfGui/EditDataOperand.xaml rename to SourceGen/WpfGui/EditDataOperand.xaml index dcfe474..6cd39aa 100644 --- a/SourceGenWPF/WpfGui/EditDataOperand.xaml +++ b/SourceGen/WpfGui/EditDataOperand.xaml @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Data operand editor. /// diff --git a/SourceGenWPF/WpfGui/EditDefSymbol.xaml b/SourceGen/WpfGui/EditDefSymbol.xaml similarity index 97% rename from SourceGenWPF/WpfGui/EditDefSymbol.xaml rename to SourceGen/WpfGui/EditDefSymbol.xaml index ea2a4d3..b253a49 100644 --- a/SourceGenWPF/WpfGui/EditDefSymbol.xaml +++ b/SourceGen/WpfGui/EditDefSymbol.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Symbol edit dialog. /// diff --git a/SourceGenWPF/WpfGui/EditInstructionOperand.xaml b/SourceGen/WpfGui/EditInstructionOperand.xaml similarity index 97% rename from SourceGenWPF/WpfGui/EditInstructionOperand.xaml rename to SourceGen/WpfGui/EditInstructionOperand.xaml index e934483..9c4c837 100644 --- a/SourceGenWPF/WpfGui/EditInstructionOperand.xaml +++ b/SourceGen/WpfGui/EditInstructionOperand.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Instruction operand editor. /// diff --git a/SourceGenWPF/WpfGui/EditLabel.xaml b/SourceGen/WpfGui/EditLabel.xaml similarity index 96% rename from SourceGenWPF/WpfGui/EditLabel.xaml rename to SourceGen/WpfGui/EditLabel.xaml index e1015aa..46e1781 100644 --- a/SourceGenWPF/WpfGui/EditLabel.xaml +++ b/SourceGen/WpfGui/EditLabel.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Edit a label. /// diff --git a/SourceGenWPF/WpfGui/EditLongComment.xaml b/SourceGen/WpfGui/EditLongComment.xaml similarity index 96% rename from SourceGenWPF/WpfGui/EditLongComment.xaml rename to SourceGen/WpfGui/EditLongComment.xaml index 542a590..be1943d 100644 --- a/SourceGenWPF/WpfGui/EditLongComment.xaml +++ b/SourceGen/WpfGui/EditLongComment.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Long comment editor. /// diff --git a/SourceGenWPF/WpfGui/EditNote.xaml b/SourceGen/WpfGui/EditNote.xaml similarity index 97% rename from SourceGenWPF/WpfGui/EditNote.xaml rename to SourceGen/WpfGui/EditNote.xaml index f9bef0b..654a0bb 100644 --- a/SourceGenWPF/WpfGui/EditNote.xaml +++ b/SourceGen/WpfGui/EditNote.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Note editor. /// diff --git a/SourceGenWPF/WpfGui/EditProjectProperties.xaml b/SourceGen/WpfGui/EditProjectProperties.xaml similarity index 99% rename from SourceGenWPF/WpfGui/EditProjectProperties.xaml rename to SourceGen/WpfGui/EditProjectProperties.xaml index 7d9a84c..b4f672f 100644 --- a/SourceGenWPF/WpfGui/EditProjectProperties.xaml +++ b/SourceGen/WpfGui/EditProjectProperties.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Project properties dialog. /// diff --git a/SourceGenWPF/WpfGui/EditStatusFlags.xaml b/SourceGen/WpfGui/EditStatusFlags.xaml similarity index 99% rename from SourceGenWPF/WpfGui/EditStatusFlags.xaml rename to SourceGen/WpfGui/EditStatusFlags.xaml index 42bd39c..4c16118 100644 --- a/SourceGenWPF/WpfGui/EditStatusFlags.xaml +++ b/SourceGen/WpfGui/EditStatusFlags.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Edit Status Flags dialog. /// diff --git a/SourceGenWPF/WpfGui/FindBox.xaml b/SourceGen/WpfGui/FindBox.xaml similarity index 93% rename from SourceGenWPF/WpfGui/FindBox.xaml rename to SourceGen/WpfGui/FindBox.xaml index 5efa306..cb815ba 100644 --- a/SourceGenWPF/WpfGui/FindBox.xaml +++ b/SourceGen/WpfGui/FindBox.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Find text dialog. /// diff --git a/SourceGenWPF/WpfGui/FontPicker.xaml b/SourceGen/WpfGui/FontPicker.xaml similarity index 96% rename from SourceGenWPF/WpfGui/FontPicker.xaml rename to SourceGen/WpfGui/FontPicker.xaml index 3996235..60d4f2c 100644 --- a/SourceGenWPF/WpfGui/FontPicker.xaml +++ b/SourceGen/WpfGui/FontPicker.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Simple font picker. /// diff --git a/SourceGenWPF/WpfGui/FormatSplitAddress.xaml b/SourceGen/WpfGui/FormatSplitAddress.xaml similarity index 98% rename from SourceGenWPF/WpfGui/FormatSplitAddress.xaml rename to SourceGen/WpfGui/FormatSplitAddress.xaml index e065c39..4731e9c 100644 --- a/SourceGenWPF/WpfGui/FormatSplitAddress.xaml +++ b/SourceGen/WpfGui/FormatSplitAddress.xaml @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Split-address table generator. /// diff --git a/SourceGenWPF/WpfGui/GotoBox.xaml b/SourceGen/WpfGui/GotoBox.xaml similarity index 96% rename from SourceGenWPF/WpfGui/GotoBox.xaml rename to SourceGen/WpfGui/GotoBox.xaml index 64eab2e..fa48dfb 100644 --- a/SourceGenWPF/WpfGui/GotoBox.xaml +++ b/SourceGen/WpfGui/GotoBox.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Go to line dialog. /// diff --git a/SourceGenWPF/WpfGui/MainWindow.xaml b/SourceGen/WpfGui/MainWindow.xaml similarity index 99% rename from SourceGenWPF/WpfGui/MainWindow.xaml rename to SourceGen/WpfGui/MainWindow.xaml index 5d4de3d..6977586 100644 --- a/SourceGenWPF/WpfGui/MainWindow.xaml +++ b/SourceGen/WpfGui/MainWindow.xaml @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. --> - - + diff --git a/SourceGenWPF/WpfGui/MainWindow.xaml.cs b/SourceGen/WpfGui/MainWindow.xaml.cs similarity index 99% rename from SourceGenWPF/WpfGui/MainWindow.xaml.cs rename to SourceGen/WpfGui/MainWindow.xaml.cs index 18cf433..1bd8104 100644 --- a/SourceGenWPF/WpfGui/MainWindow.xaml.cs +++ b/SourceGen/WpfGui/MainWindow.xaml.cs @@ -32,7 +32,7 @@ using System.Windows.Media; using CommonUtil; using CommonWPF; -namespace SourceGenWPF.WpfGui { +namespace SourceGen.WpfGui { /// /// Interaction logic for MainWindow.xaml /// diff --git a/SourceGenWPF/WpfGui/NewProject.xaml b/SourceGen/WpfGui/NewProject.xaml similarity index 96% rename from SourceGenWPF/WpfGui/NewProject.xaml rename to SourceGen/WpfGui/NewProject.xaml index 1234275..8008293 100644 --- a/SourceGenWPF/WpfGui/NewProject.xaml +++ b/SourceGen/WpfGui/NewProject.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// New project creation dialog. /// diff --git a/SourceGenWPF/WpfGui/ProjectLoadIssues.xaml b/SourceGen/WpfGui/ProjectLoadIssues.xaml similarity index 94% rename from SourceGenWPF/WpfGui/ProjectLoadIssues.xaml rename to SourceGen/WpfGui/ProjectLoadIssues.xaml index 120bcc5..3491717 100644 --- a/SourceGenWPF/WpfGui/ProjectLoadIssues.xaml +++ b/SourceGen/WpfGui/ProjectLoadIssues.xaml @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - /// Display errors and warnings generated while attempting to open a project. /// diff --git a/SourceGenWPF/XrefSet.cs b/SourceGen/XrefSet.cs similarity index 99% rename from SourceGenWPF/XrefSet.cs rename to SourceGen/XrefSet.cs index fb77bae..ec04504 100644 --- a/SourceGenWPF/XrefSet.cs +++ b/SourceGen/XrefSet.cs @@ -18,7 +18,7 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics; -namespace SourceGenWPF { +namespace SourceGen { /// /// Tracks a set of offsets that reference a single address or label. /// diff --git a/WorkBench.sln b/WorkBench.sln index c221864..a0bb5c8 100644 --- a/WorkBench.sln +++ b/WorkBench.sln @@ -25,7 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeDistWF", "MakeDistWF\Ma EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonWinForms", "CommonWinForms\CommonWinForms.csproj", "{08EC328D-078E-4236-B574-BE6B3FD85915}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGenWPF", "SourceGenWPF\SourceGenWPF.csproj", "{30C35BBC-B9ED-4723-8F9D-597D51CCB13A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceGen", "SourceGen\SourceGen.csproj", "{30C35BBC-B9ED-4723-8F9D-597D51CCB13A}" ProjectSection(ProjectDependencies) = postProject {1299AA2E-606D-4F3E-B3A9-3F9421E44667} = {1299AA2E-606D-4F3E-B3A9-3F9421E44667} EndProjectSection