1
0
mirror of https://github.com/fadden/6502bench.git synced 2025-02-09 11:31:24 +00:00

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.
This commit is contained in:
Andy McFadden 2019-06-21 15:17:04 -07:00
parent fdf53bdb34
commit 007bf4e934
16 changed files with 35 additions and 35 deletions

View File

@ -17,7 +17,7 @@ limitations under the License.
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:SourceGenWPF" xmlns:local="clr-namespace:SourceGenWPF"
StartupUri="ProjWin/MainWindow.xaml"> StartupUri="WpfGui/MainWindow.xaml">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<FontFamily x:Key="GeneralMonoFont">Consolas</FontFamily> <FontFamily x:Key="GeneralMonoFont">Consolas</FontFamily>

View File

@ -25,8 +25,8 @@ using System.Windows;
using Asm65; using Asm65;
using CommonUtil; using CommonUtil;
using CommonWPF; using CommonWPF;
using SourceGenWPF.ProjWin;
using SourceGenWPF.Sandbox; using SourceGenWPF.Sandbox;
using SourceGenWPF.WpfGui;
namespace SourceGenWPF { namespace SourceGenWPF {
/// <summary> /// <summary>

View File

@ -75,19 +75,19 @@
<Compile Include="AsmGen\StringGather.cs" /> <Compile Include="AsmGen\StringGather.cs" />
<Compile Include="DisplayList.cs" /> <Compile Include="DisplayList.cs" />
<Compile Include="MainController.cs" /> <Compile Include="MainController.cs" />
<Compile Include="ProjWin\DataFileLoadIssue.xaml.cs"> <Compile Include="WpfGui\DataFileLoadIssue.xaml.cs">
<DependentUpon>DataFileLoadIssue.xaml</DependentUpon> <DependentUpon>DataFileLoadIssue.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="ProjWin\DiscardChanges.xaml.cs"> <Compile Include="WpfGui\DiscardChanges.xaml.cs">
<DependentUpon>DiscardChanges.xaml</DependentUpon> <DependentUpon>DiscardChanges.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="ProjWin\EditAddress.xaml.cs"> <Compile Include="WpfGui\EditAddress.xaml.cs">
<DependentUpon>EditAddress.xaml</DependentUpon> <DependentUpon>EditAddress.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="ProjWin\EditStatusFlags.xaml.cs"> <Compile Include="WpfGui\EditStatusFlags.xaml.cs">
<DependentUpon>EditStatusFlags.xaml</DependentUpon> <DependentUpon>EditStatusFlags.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="ProjWin\ProjectLoadIssue.xaml.cs"> <Compile Include="WpfGui\ProjectLoadIssue.xaml.cs">
<DependentUpon>ProjectLoadIssue.xaml</DependentUpon> <DependentUpon>ProjectLoadIssue.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="PseudoOp.cs" /> <Compile Include="PseudoOp.cs" />
@ -123,7 +123,7 @@
<Compile Include="PlatformSymbols.cs" /> <Compile Include="PlatformSymbols.cs" />
<Compile Include="ProjectFile.cs" /> <Compile Include="ProjectFile.cs" />
<Compile Include="ProjectProperties.cs" /> <Compile Include="ProjectProperties.cs" />
<Compile Include="ProjWin\MainWindow.xaml.cs"> <Compile Include="WpfGui\MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon> <DependentUpon>MainWindow.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
@ -155,31 +155,31 @@
<Resource Include="Res\Logo.png" /> <Resource Include="Res\Logo.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="ProjWin\CodeListItemStyle.xaml"> <Page Include="WpfGui\CodeListItemStyle.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="ProjWin\DataFileLoadIssue.xaml"> <Page Include="WpfGui\DataFileLoadIssue.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="ProjWin\DiscardChanges.xaml"> <Page Include="WpfGui\DiscardChanges.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="ProjWin\EditAddress.xaml"> <Page Include="WpfGui\EditAddress.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="ProjWin\EditStatusFlags.xaml"> <Page Include="WpfGui\EditStatusFlags.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="ProjWin\MainWindow.xaml"> <Page Include="WpfGui\MainWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="ProjWin\ProjectLoadIssue.xaml"> <Page Include="WpfGui\ProjectLoadIssue.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>

View File

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License. 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="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SourceGenWPF.ProjWin" xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
mc:Ignorable="d" mc:Ignorable="d"
Title="Data File Load Issue" ShowInTaskbar="False" Title="Data File Load Issue" ShowInTaskbar="False"
Width="570" Height="143" ResizeMode="NoResize" WindowStartupLocation="CenterOwner"> Width="570" Height="143" ResizeMode="NoResize" WindowStartupLocation="CenterOwner">

View File

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

View File

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

View File

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

View File

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

View File

@ -18,7 +18,7 @@ using System.Diagnostics;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
namespace SourceGenWPF.ProjWin { namespace SourceGenWPF.WpfGui {
/// <summary> /// <summary>
/// Edit Address dialog. /// Edit Address dialog.
/// </summary> /// </summary>

View File

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

View File

@ -19,7 +19,7 @@ using System.Windows.Controls;
using Asm65; using Asm65;
namespace SourceGenWPF.ProjWin { namespace SourceGenWPF.WpfGui {
/// <summary> /// <summary>
/// Edit Status Flags dialog. /// Edit Status Flags dialog.
/// </summary> /// </summary>

View File

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License. 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="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SourceGenWPF.ProjWin" xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
mc:Ignorable="d" mc:Ignorable="d"
Title="6502bench SourceGen" Title="6502bench SourceGen"
Icon="/SourceGenWPF;component/Res/SourceGenIcon.ico" Icon="/SourceGenWPF;component/Res/SourceGenIcon.ico"

View File

@ -30,7 +30,7 @@ using System.Windows.Media;
using CommonUtil; using CommonUtil;
using CommonWPF; using CommonWPF;
namespace SourceGenWPF.ProjWin { namespace SourceGenWPF.WpfGui {
/// <summary> /// <summary>
/// Interaction logic for MainWindow.xaml /// Interaction logic for MainWindow.xaml
/// </summary> /// </summary>
@ -386,7 +386,7 @@ namespace SourceGenWPF.ProjWin {
try { try {
widths = TextUtil.DeserializeIntArray(str); widths = TextUtil.DeserializeIntArray(str);
} catch (Exception ex) { } catch (Exception ex) {
Debug.WriteLine("Unable to deserialize widths for GridView"); Debug.WriteLine("Unable to deserialize widths for GridView: " + ex.Message);
return; return;
} }
if (widths.Length != gv.Columns.Count) { if (widths.Length != gv.Columns.Count) {
@ -403,7 +403,7 @@ namespace SourceGenWPF.ProjWin {
try { try {
widths = TextUtil.DeserializeIntArray(str); widths = TextUtil.DeserializeIntArray(str);
} catch (Exception ex) { } catch (Exception ex) {
Debug.WriteLine("Unable to deserialize widths for " + dg.Name); Debug.WriteLine("Unable to deserialize widths for " + dg.Name + ": " + ex.Message);
return; return;
} }
if (widths.Length != dg.Columns.Count) { if (widths.Length != dg.Columns.Count) {

View File

@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License. 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="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:SourceGenWPF.ProjWin" xmlns:local="clr-namespace:SourceGenWPF.WpfGui"
mc:Ignorable="d" mc:Ignorable="d"
Title="Project Load Issues" ShowInTaskbar="False" Title="Project Load Issues" ShowInTaskbar="False"
Width="570" Height="231" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" Width="570" Height="231" ResizeMode="NoResize" WindowStartupLocation="CenterOwner"

View File

@ -16,7 +16,7 @@
using System; using System;
using System.Windows; using System.Windows;
namespace SourceGenWPF.ProjWin { namespace SourceGenWPF.WpfGui {
/// <summary> /// <summary>
/// Display errors and warnings generated while attempting to open a project. /// Display errors and warnings generated while attempting to open a project.
/// </summary> /// </summary>