From 007bf4e934cc9a62aa13a035e3d4632ada6af5d1 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Fri, 21 Jun 2019 15:17:04 -0700
Subject: [PATCH] Rename ProjWin directory to WpfGui

"ProjWin" didn't really mean anything.  "WpfGui" emphasizes that
the contents are a WPF implementation of the GUI elements.

No substantive changes.
---
 SourceGenWPF/App.xaml                         |  2 +-
 SourceGenWPF/MainController.cs                |  2 +-
 SourceGenWPF/SourceGenWPF.csproj              | 26 +++++++++----------
 .../CodeListItemStyle.xaml                    |  0
 .../DataFileLoadIssue.xaml                    |  4 +--
 .../DataFileLoadIssue.xaml.cs                 |  2 +-
 .../{ProjWin => WpfGui}/DiscardChanges.xaml   |  4 +--
 .../DiscardChanges.xaml.cs                    |  2 +-
 .../{ProjWin => WpfGui}/EditAddress.xaml      |  4 +--
 .../{ProjWin => WpfGui}/EditAddress.xaml.cs   |  2 +-
 .../{ProjWin => WpfGui}/EditStatusFlags.xaml  |  4 +--
 .../EditStatusFlags.xaml.cs                   |  2 +-
 .../{ProjWin => WpfGui}/MainWindow.xaml       |  4 +--
 .../{ProjWin => WpfGui}/MainWindow.xaml.cs    |  6 ++---
 .../{ProjWin => WpfGui}/ProjectLoadIssue.xaml |  4 +--
 .../ProjectLoadIssue.xaml.cs                  |  2 +-
 16 files changed, 35 insertions(+), 35 deletions(-)
 rename SourceGenWPF/{ProjWin => WpfGui}/CodeListItemStyle.xaml (100%)
 rename SourceGenWPF/{ProjWin => WpfGui}/DataFileLoadIssue.xaml (94%)
 rename SourceGenWPF/{ProjWin => WpfGui}/DataFileLoadIssue.xaml.cs (97%)
 rename SourceGenWPF/{ProjWin => WpfGui}/DiscardChanges.xaml (94%)
 rename SourceGenWPF/{ProjWin => WpfGui}/DiscardChanges.xaml.cs (97%)
 rename SourceGenWPF/{ProjWin => WpfGui}/EditAddress.xaml (95%)
 rename SourceGenWPF/{ProjWin => WpfGui}/EditAddress.xaml.cs (99%)
 rename SourceGenWPF/{ProjWin => WpfGui}/EditStatusFlags.xaml (99%)
 rename SourceGenWPF/{ProjWin => WpfGui}/EditStatusFlags.xaml.cs (99%)
 rename SourceGenWPF/{ProjWin => WpfGui}/MainWindow.xaml (99%)
 rename SourceGenWPF/{ProjWin => WpfGui}/MainWindow.xaml.cs (99%)
 rename SourceGenWPF/{ProjWin => WpfGui}/ProjectLoadIssue.xaml (94%)
 rename SourceGenWPF/{ProjWin => WpfGui}/ProjectLoadIssue.xaml.cs (98%)

diff --git a/SourceGenWPF/App.xaml b/SourceGenWPF/App.xaml
index 53b96ad..c9ee61f 100644
--- a/SourceGenWPF/App.xaml
+++ b/SourceGenWPF/App.xaml
@@ -17,7 +17,7 @@ limitations under the License.
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:SourceGenWPF"
-             StartupUri="ProjWin/MainWindow.xaml">
+             StartupUri="WpfGui/MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
             <FontFamily x:Key="GeneralMonoFont">Consolas</FontFamily>
diff --git a/SourceGenWPF/MainController.cs b/SourceGenWPF/MainController.cs
index aec5279..7c2b760 100644
--- a/SourceGenWPF/MainController.cs
+++ b/SourceGenWPF/MainController.cs
@@ -25,8 +25,8 @@ using System.Windows;
 using Asm65;
 using CommonUtil;
 using CommonWPF;
-using SourceGenWPF.ProjWin;
 using SourceGenWPF.Sandbox;
+using SourceGenWPF.WpfGui;
 
 namespace SourceGenWPF {
     /// <summary>
diff --git a/SourceGenWPF/SourceGenWPF.csproj b/SourceGenWPF/SourceGenWPF.csproj
index 96c6aab..58745c4 100644
--- a/SourceGenWPF/SourceGenWPF.csproj
+++ b/SourceGenWPF/SourceGenWPF.csproj
@@ -75,19 +75,19 @@
     <Compile Include="AsmGen\StringGather.cs" />
     <Compile Include="DisplayList.cs" />
     <Compile Include="MainController.cs" />
-    <Compile Include="ProjWin\DataFileLoadIssue.xaml.cs">
+    <Compile Include="WpfGui\DataFileLoadIssue.xaml.cs">
       <DependentUpon>DataFileLoadIssue.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjWin\DiscardChanges.xaml.cs">
+    <Compile Include="WpfGui\DiscardChanges.xaml.cs">
       <DependentUpon>DiscardChanges.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjWin\EditAddress.xaml.cs">
+    <Compile Include="WpfGui\EditAddress.xaml.cs">
       <DependentUpon>EditAddress.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjWin\EditStatusFlags.xaml.cs">
+    <Compile Include="WpfGui\EditStatusFlags.xaml.cs">
       <DependentUpon>EditStatusFlags.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ProjWin\ProjectLoadIssue.xaml.cs">
+    <Compile Include="WpfGui\ProjectLoadIssue.xaml.cs">
       <DependentUpon>ProjectLoadIssue.xaml</DependentUpon>
     </Compile>
     <Compile Include="PseudoOp.cs" />
@@ -123,7 +123,7 @@
     <Compile Include="PlatformSymbols.cs" />
     <Compile Include="ProjectFile.cs" />
     <Compile Include="ProjectProperties.cs" />
-    <Compile Include="ProjWin\MainWindow.xaml.cs">
+    <Compile Include="WpfGui\MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -155,31 +155,31 @@
     <Resource Include="Res\Logo.png" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="ProjWin\CodeListItemStyle.xaml">
+    <Page Include="WpfGui\CodeListItemStyle.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ProjWin\DataFileLoadIssue.xaml">
+    <Page Include="WpfGui\DataFileLoadIssue.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjWin\DiscardChanges.xaml">
+    <Page Include="WpfGui\DiscardChanges.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjWin\EditAddress.xaml">
+    <Page Include="WpfGui\EditAddress.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjWin\EditStatusFlags.xaml">
+    <Page Include="WpfGui\EditStatusFlags.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjWin\MainWindow.xaml">
+    <Page Include="WpfGui\MainWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ProjWin\ProjectLoadIssue.xaml">
+    <Page Include="WpfGui\ProjectLoadIssue.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/SourceGenWPF/ProjWin/CodeListItemStyle.xaml b/SourceGenWPF/WpfGui/CodeListItemStyle.xaml
similarity index 100%
rename from SourceGenWPF/ProjWin/CodeListItemStyle.xaml
rename to SourceGenWPF/WpfGui/CodeListItemStyle.xaml
diff --git a/SourceGenWPF/ProjWin/DataFileLoadIssue.xaml b/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml
similarity index 94%
rename from SourceGenWPF/ProjWin/DataFileLoadIssue.xaml
rename to SourceGenWPF/WpfGui/DataFileLoadIssue.xaml
index 683277c..93e12f7 100644
--- a/SourceGenWPF/ProjWin/DataFileLoadIssue.xaml
+++ b/SourceGenWPF/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.ProjWin.DataFileLoadIssue"
+<Window x:Class="SourceGenWPF.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.ProjWin"
+        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
         Title="Data File Load Issue" ShowInTaskbar="False"
         Width="570" Height="143" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">
diff --git a/SourceGenWPF/ProjWin/DataFileLoadIssue.xaml.cs b/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml.cs
similarity index 97%
rename from SourceGenWPF/ProjWin/DataFileLoadIssue.xaml.cs
rename to SourceGenWPF/WpfGui/DataFileLoadIssue.xaml.cs
index d7ae4ea..b6625ff 100644
--- a/SourceGenWPF/ProjWin/DataFileLoadIssue.xaml.cs
+++ b/SourceGenWPF/WpfGui/DataFileLoadIssue.xaml.cs
@@ -16,7 +16,7 @@
 using System;
 using System.Windows;
 
-namespace SourceGenWPF.ProjWin {
+namespace SourceGenWPF.WpfGui {
     /// <summary>
     /// Report a problem encountered while loading a data file.
     /// </summary>
diff --git a/SourceGenWPF/ProjWin/DiscardChanges.xaml b/SourceGenWPF/WpfGui/DiscardChanges.xaml
similarity index 94%
rename from SourceGenWPF/ProjWin/DiscardChanges.xaml
rename to SourceGenWPF/WpfGui/DiscardChanges.xaml
index 38e16ee..afe3bdd 100644
--- a/SourceGenWPF/ProjWin/DiscardChanges.xaml
+++ b/SourceGenWPF/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.ProjWin.DiscardChanges"
+<Window x:Class="SourceGenWPF.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.ProjWin"
+        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
         Title="Discard Changes?"
         FocusManager.FocusedElement="{Binding ElementName=cancelButton}"
diff --git a/SourceGenWPF/ProjWin/DiscardChanges.xaml.cs b/SourceGenWPF/WpfGui/DiscardChanges.xaml.cs
similarity index 97%
rename from SourceGenWPF/ProjWin/DiscardChanges.xaml.cs
rename to SourceGenWPF/WpfGui/DiscardChanges.xaml.cs
index cb91621..01c7fad 100644
--- a/SourceGenWPF/ProjWin/DiscardChanges.xaml.cs
+++ b/SourceGenWPF/WpfGui/DiscardChanges.xaml.cs
@@ -16,7 +16,7 @@
 using System;
 using System.Windows;
 
-namespace SourceGenWPF.ProjWin {
+namespace SourceGenWPF.WpfGui {
     /// <summary>
     /// Prompt the user before discarding changes.
     /// 
diff --git a/SourceGenWPF/ProjWin/EditAddress.xaml b/SourceGenWPF/WpfGui/EditAddress.xaml
similarity index 95%
rename from SourceGenWPF/ProjWin/EditAddress.xaml
rename to SourceGenWPF/WpfGui/EditAddress.xaml
index f9f99a2..cd982e4 100644
--- a/SourceGenWPF/ProjWin/EditAddress.xaml
+++ b/SourceGenWPF/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.ProjWin.EditAddress"
+<Window x:Class="SourceGenWPF.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.ProjWin"
+        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
         Title="Set Address"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"
diff --git a/SourceGenWPF/ProjWin/EditAddress.xaml.cs b/SourceGenWPF/WpfGui/EditAddress.xaml.cs
similarity index 99%
rename from SourceGenWPF/ProjWin/EditAddress.xaml.cs
rename to SourceGenWPF/WpfGui/EditAddress.xaml.cs
index 3331447..e5afa06 100644
--- a/SourceGenWPF/ProjWin/EditAddress.xaml.cs
+++ b/SourceGenWPF/WpfGui/EditAddress.xaml.cs
@@ -18,7 +18,7 @@ using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace SourceGenWPF.ProjWin {
+namespace SourceGenWPF.WpfGui {
     /// <summary>
     /// Edit Address dialog.
     /// </summary>
diff --git a/SourceGenWPF/ProjWin/EditStatusFlags.xaml b/SourceGenWPF/WpfGui/EditStatusFlags.xaml
similarity index 99%
rename from SourceGenWPF/ProjWin/EditStatusFlags.xaml
rename to SourceGenWPF/WpfGui/EditStatusFlags.xaml
index dc457d2..4d12e53 100644
--- a/SourceGenWPF/ProjWin/EditStatusFlags.xaml
+++ b/SourceGenWPF/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.ProjWin.EditStatusFlags"
+<Window x:Class="SourceGenWPF.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.ProjWin"
+        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
         Title="Override Status Flags"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"
diff --git a/SourceGenWPF/ProjWin/EditStatusFlags.xaml.cs b/SourceGenWPF/WpfGui/EditStatusFlags.xaml.cs
similarity index 99%
rename from SourceGenWPF/ProjWin/EditStatusFlags.xaml.cs
rename to SourceGenWPF/WpfGui/EditStatusFlags.xaml.cs
index 270bd09..4c37d83 100644
--- a/SourceGenWPF/ProjWin/EditStatusFlags.xaml.cs
+++ b/SourceGenWPF/WpfGui/EditStatusFlags.xaml.cs
@@ -19,7 +19,7 @@ using System.Windows.Controls;
 
 using Asm65;
 
-namespace SourceGenWPF.ProjWin {
+namespace SourceGenWPF.WpfGui {
     /// <summary>
     /// Edit Status Flags dialog.
     /// </summary>
diff --git a/SourceGenWPF/ProjWin/MainWindow.xaml b/SourceGenWPF/WpfGui/MainWindow.xaml
similarity index 99%
rename from SourceGenWPF/ProjWin/MainWindow.xaml
rename to SourceGenWPF/WpfGui/MainWindow.xaml
index 8ad4749..30fefd5 100644
--- a/SourceGenWPF/ProjWin/MainWindow.xaml
+++ b/SourceGenWPF/WpfGui/MainWindow.xaml
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.ProjWin.MainWindow"
+<Window x:Class="SourceGenWPF.WpfGui.MainWindow"
         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.ProjWin"
+        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
         Title="6502bench SourceGen"
         Icon="/SourceGenWPF;component/Res/SourceGenIcon.ico"
diff --git a/SourceGenWPF/ProjWin/MainWindow.xaml.cs b/SourceGenWPF/WpfGui/MainWindow.xaml.cs
similarity index 99%
rename from SourceGenWPF/ProjWin/MainWindow.xaml.cs
rename to SourceGenWPF/WpfGui/MainWindow.xaml.cs
index 52bfd93..dc940e9 100644
--- a/SourceGenWPF/ProjWin/MainWindow.xaml.cs
+++ b/SourceGenWPF/WpfGui/MainWindow.xaml.cs
@@ -30,7 +30,7 @@ using System.Windows.Media;
 using CommonUtil;
 using CommonWPF;
 
-namespace SourceGenWPF.ProjWin {
+namespace SourceGenWPF.WpfGui {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
@@ -386,7 +386,7 @@ namespace SourceGenWPF.ProjWin {
             try {
                 widths = TextUtil.DeserializeIntArray(str);
             } catch (Exception ex) {
-                Debug.WriteLine("Unable to deserialize widths for GridView");
+                Debug.WriteLine("Unable to deserialize widths for GridView: " + ex.Message);
                 return;
             }
             if (widths.Length != gv.Columns.Count) {
@@ -403,7 +403,7 @@ namespace SourceGenWPF.ProjWin {
             try {
                 widths = TextUtil.DeserializeIntArray(str);
             } catch (Exception ex) {
-                Debug.WriteLine("Unable to deserialize widths for " + dg.Name);
+                Debug.WriteLine("Unable to deserialize widths for " + dg.Name + ": " + ex.Message);
                 return;
             }
             if (widths.Length != dg.Columns.Count) {
diff --git a/SourceGenWPF/ProjWin/ProjectLoadIssue.xaml b/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml
similarity index 94%
rename from SourceGenWPF/ProjWin/ProjectLoadIssue.xaml
rename to SourceGenWPF/WpfGui/ProjectLoadIssue.xaml
index e6c2092..46f2acf 100644
--- a/SourceGenWPF/ProjWin/ProjectLoadIssue.xaml
+++ b/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<Window x:Class="SourceGenWPF.ProjWin.ProjectLoadIssues"
+<Window x:Class="SourceGenWPF.WpfGui.ProjectLoadIssues"
         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.ProjWin"
+        xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
         mc:Ignorable="d"
         Title="Project Load Issues" ShowInTaskbar="False"
         Width="570" Height="231" ResizeMode="NoResize" WindowStartupLocation="CenterOwner"
diff --git a/SourceGenWPF/ProjWin/ProjectLoadIssue.xaml.cs b/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml.cs
similarity index 98%
rename from SourceGenWPF/ProjWin/ProjectLoadIssue.xaml.cs
rename to SourceGenWPF/WpfGui/ProjectLoadIssue.xaml.cs
index 24f15a7..ab19906 100644
--- a/SourceGenWPF/ProjWin/ProjectLoadIssue.xaml.cs
+++ b/SourceGenWPF/WpfGui/ProjectLoadIssue.xaml.cs
@@ -16,7 +16,7 @@
 using System;
 using System.Windows;
 
-namespace SourceGenWPF.ProjWin {
+namespace SourceGenWPF.WpfGui {
     /// <summary>
     /// Display errors and warnings generated while attempting to open a project.
     /// </summary>