alphafetus/pcgs-inv
1
0 Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Allowed ErrorWindow to close properly.

Browse Source
This commit is contained in:
alphafetus committed 2023-11-23 17:35:40 -05:00
1 parent 663fb256e5
commit 93219aaf9b
7 files changed
+14 -291
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PcgsInvUi.csproj
-224
View File
@@ -1,224 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{54609B1E-BC06-306E-9607-8EAEF1F4571E}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
<Platform>x64</Platform>
<ProjectName>PcgsInvUi</ProjectName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
<ManagedAssembly>true</ManagedAssembly>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<DebugSymbols>true</DebugSymbols>
<DefineDebug>true</DefineDebug>
<OutputPath>C:\Users\lvas4\RiderProjects\pcgs-inv\Debug\</OutputPath>
<PlatformToolset>v143</PlatformToolset>
<AssemblyName>PcgsInvUi</AssemblyName>
<StartAction>Program</StartAction>
<StartProgram>C:\Users\lvas4\RiderProjects\pcgs-inv\Debug\PcgsInvUi.exe</StartProgram>
<DebugType>full</DebugType>
<DefineConstants>DEBUG</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<LangVersion>latest</LangVersion>
<Optimize>false</Optimize>
<WarningLevel>3</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<OutputPath>C:\Users\lvas4\RiderProjects\pcgs-inv\Release\</OutputPath>
<PlatformToolset>v143</PlatformToolset>
<AssemblyName>PcgsInvUi</AssemblyName>
<StartAction>Program</StartAction>
<StartProgram>C:\Users\lvas4\RiderProjects\pcgs-inv\Release\PcgsInvUi.exe</StartProgram>
<DebugType>none</DebugType>
<DefineConstants></DefineConstants>
<ErrorReport>queue</ErrorReport>
<LangVersion>latest</LangVersion>
<Optimize>true</Optimize>
<WarningLevel>1</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'" Label="Configuration">
<OutputPath>C:\Users\lvas4\RiderProjects\pcgs-inv\MinSizeRel\</OutputPath>
<PlatformToolset>v143</PlatformToolset>
<AssemblyName>PcgsInvUi</AssemblyName>
<StartAction>Program</StartAction>
<StartProgram>C:\Users\lvas4\RiderProjects\pcgs-inv\MinSizeRel\PcgsInvUi.exe</StartProgram>
<DebugType>none</DebugType>
<DefineConstants></DefineConstants>
<LangVersion>latest</LangVersion>
<Optimize>true</Optimize>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
<DebugSymbols>true</DebugSymbols>
<DefineDebug>true</DefineDebug>
<OutputPath>C:\Users\lvas4\RiderProjects\pcgs-inv\RelWithDebInfo\</OutputPath>
<PlatformToolset>v143</PlatformToolset>
<AssemblyName>PcgsInvUi</AssemblyName>
<StartAction>Program</StartAction>
<StartProgram>C:\Users\lvas4\RiderProjects\pcgs-inv\RelWithDebInfo\PcgsInvUi.exe</StartProgram>
<DebugType>full</DebugType>
<DefineConstants></DefineConstants>
<LangVersion>latest</LangVersion>
<Optimize>false</Optimize>
</PropertyGroup>
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.CSharp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.CSharp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemGroup>
<None Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\CMakeLists.txt">
<Link>CMakeLists.txt</Link>
</None>
</ItemGroup>
<Target Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Name="CustomCommand_Debug_2b1af5d328edb17d91180d581ead755d"
Inputs="C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeCSharpInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CSharpUtilities.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\WindowsPaths.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeCSharpCompiler.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeSystem.cmake"
Outputs="C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\generate.stamp">
<Exec Command="echo Building Custom Rule C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt" />
<Exec Command="setlocal&#10;&quot;C:\Program Files\CMake\bin\cmake.exe&quot; -SC:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi -BC:/Users/lvas4/RiderProjects/pcgs-inv --check-stamp-file C:/Users/lvas4/RiderProjects/pcgs-inv/CMakeFiles/generate.stamp&#10;if %errorlevel% neq 0 goto :cmEnd&#10;:cmEnd&#10;endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone&#10;:cmErrorLevel&#10;exit /b %1&#10;:cmDone&#10;if %errorlevel% neq 0 goto :VCEnd&#10;:VCEnd" />
</Target>
<Target Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Name="CustomCommand_Release_2b1af5d328edb17d91180d581ead755d"
Inputs="C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeCSharpInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CSharpUtilities.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\WindowsPaths.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeCSharpCompiler.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeSystem.cmake"
Outputs="C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\generate.stamp">
<Exec Command="echo Building Custom Rule C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt" />
<Exec Command="setlocal&#10;&quot;C:\Program Files\CMake\bin\cmake.exe&quot; -SC:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi -BC:/Users/lvas4/RiderProjects/pcgs-inv --check-stamp-file C:/Users/lvas4/RiderProjects/pcgs-inv/CMakeFiles/generate.stamp&#10;if %errorlevel% neq 0 goto :cmEnd&#10;:cmEnd&#10;endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone&#10;:cmErrorLevel&#10;exit /b %1&#10;:cmDone&#10;if %errorlevel% neq 0 goto :VCEnd&#10;:VCEnd" />
</Target>
<Target Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"
Name="CustomCommand_MinSizeRel_2b1af5d328edb17d91180d581ead755d"
Inputs="C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeCSharpInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CSharpUtilities.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\WindowsPaths.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeCSharpCompiler.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeSystem.cmake"
Outputs="C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\generate.stamp">
<Exec Command="echo Building Custom Rule C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt" />
<Exec Command="setlocal&#10;&quot;C:\Program Files\CMake\bin\cmake.exe&quot; -SC:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi -BC:/Users/lvas4/RiderProjects/pcgs-inv --check-stamp-file C:/Users/lvas4/RiderProjects/pcgs-inv/CMakeFiles/generate.stamp&#10;if %errorlevel% neq 0 goto :cmEnd&#10;:cmEnd&#10;endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone&#10;:cmErrorLevel&#10;exit /b %1&#10;:cmDone&#10;if %errorlevel% neq 0 goto :VCEnd&#10;:VCEnd" />
</Target>
<Target Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"
Name="CustomCommand_RelWithDebInfo_2b1af5d328edb17d91180d581ead755d"
Inputs="C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeCSharpInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeGenericSystem.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeInitializeConfigs.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInformation.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CMakeSystemSpecificInitialize.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\CSharpUtilities.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\Windows.cmake;C:\Program Files\CMake\share\cmake-3.25\Modules\Platform\WindowsPaths.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeCSharpCompiler.cmake;C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\3.25.1\CMakeSystem.cmake"
Outputs="C:\Users\lvas4\RiderProjects\pcgs-inv\CMakeFiles\generate.stamp">
<Exec Command="echo Building Custom Rule C:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi/CMakeLists.txt" />
<Exec Command="setlocal&#10;&quot;C:\Program Files\CMake\bin\cmake.exe&quot; -SC:/Users/lvas4/RiderProjects/pcgs-inv/PcgsInvUi -BC:/Users/lvas4/RiderProjects/pcgs-inv --check-stamp-file C:/Users/lvas4/RiderProjects/pcgs-inv/CMakeFiles/generate.stamp&#10;if %errorlevel% neq 0 goto :cmEnd&#10;:cmEnd&#10;endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone&#10;:cmErrorLevel&#10;exit /b %1&#10;:cmDone&#10;if %errorlevel% neq 0 goto :VCEnd&#10;:VCEnd" />
</Target>
<ItemGroup>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\App.axaml.cs">
<Link>App.axaml.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Program.cs">
<Link>Program.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewLocator.cs">
<Link>ViewLocator.cs</Link>
</Compile>
<None Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\App.axaml">
<Link>App.axaml</Link>
</None>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Models\Coin.cs">
<Link>Models\Coin.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Services\CoinCollection.cs">
<Link>Services\CoinCollection.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Services\CoinDatabase.cs">
<Link>Services\CoinDatabase.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Services\PcgsClient.cs">
<Link>Services\PcgsClient.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\CoinListViewModel.cs">
<Link>ViewModels\CoinListViewModel.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\DeleteWindowViewModel.cs">
<Link>ViewModels\DeleteWindowViewModel.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\EditViewModel.cs">
<Link>ViewModels\EditViewModel.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\ErrorWindowViewModel.cs">
<Link>ViewModels\ErrorWindowViewModel.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\FindWindowViewModel.cs">
<Link>ViewModels\FindWindowViewModel.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\MainWindowViewModel.cs">
<Link>ViewModels\MainWindowViewModel.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\NewViewModel.cs">
<Link>ViewModels\NewViewModel.cs</Link>
</Compile>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\ViewModels\ViewModelBase.cs">
<Link>ViewModels\ViewModelBase.cs</Link>
</Compile>
<None Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\DeleteWindow.axaml">
<Link>Views\DeleteWindow.axaml</Link>
</None>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\DeleteWindow.axaml.cs">
<Link>Views\DeleteWindow.axaml.cs</Link>
</Compile>
<None Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\ErrorWindow.axaml">
<Link>Views\ErrorWindow.axaml</Link>
</None>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\ErrorWindow.axaml.cs">
<Link>Views\ErrorWindow.axaml.cs</Link>
</Compile>
<None Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\FindWindow.axaml">
<Link>Views\FindWindow.axaml</Link>
</None>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\FindWindow.axaml.cs">
<Link>Views\FindWindow.axaml.cs</Link>
</Compile>
<None Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\MainWindow.axaml">
<Link>Views\MainWindow.axaml</Link>
</None>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\MainWindow.axaml.cs">
<Link>Views\MainWindow.axaml.cs</Link>
</Compile>
<None Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\NewView.axaml">
<Link>Views\NewView.axaml</Link>
</None>
<Compile Include="C:\Users\lvas4\RiderProjects\pcgs-inv\PcgsInvUi\Views\NewView.axaml.cs">
<Link>Views\NewView.axaml.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp">
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="C:\Users\lvas4\RiderProjects\pcgs-inv\ZERO_CHECK.vcxproj">
<Project>{3FD6A666-E15C-386C-9AAE-B352CA747977}</Project>
<Name>ZERO_CHECK</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'MinSizeRel'">
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'RelWithDebInfo'">
</PropertyGroup>
<PropertyGroup>
<BuildDependsOn>
CustomCommand_Debug_2b1af5d328edb17d91180d581ead755d;
CustomCommand_MinSizeRel_2b1af5d328edb17d91180d581ead755d;
CustomCommand_RelWithDebInfo_2b1af5d328edb17d91180d581ead755d;
CustomCommand_Release_2b1af5d328edb17d91180d581ead755d;
$(BuildDependsOn)
</BuildDependsOn>
</PropertyGroup>
</Project>
PcgsInvUi.sln
-53
View File
@@ -1,53 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{1318C6B3-3038-3793-8B5B-FFAF1B645D42}"
ProjectSection(ProjectDependencies) = postProject
{54609B1E-BC06-306E-9607-8EAEF1F4571E} = {54609B1E-BC06-306E-9607-8EAEF1F4571E}
{3FD6A666-E15C-386C-9AAE-B352CA747977} = {3FD6A666-E15C-386C-9AAE-B352CA747977}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PcgsInvUi", "PcgsInvUi.csproj", "{54609B1E-BC06-306E-9607-8EAEF1F4571E}"
ProjectSection(ProjectDependencies) = postProject
{3FD6A666-E15C-386C-9AAE-B352CA747977} = {3FD6A666-E15C-386C-9AAE-B352CA747977}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "ZERO_CHECK.vcxproj", "{3FD6A666-E15C-386C-9AAE-B352CA747977}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Release|x64 = Release|x64
MinSizeRel|x64 = MinSizeRel|x64
RelWithDebInfo|x64 = RelWithDebInfo|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1318C6B3-3038-3793-8B5B-FFAF1B645D42}.Debug|x64.ActiveCfg = Debug|x64
{1318C6B3-3038-3793-8B5B-FFAF1B645D42}.Release|x64.ActiveCfg = Release|x64
{1318C6B3-3038-3793-8B5B-FFAF1B645D42}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
{1318C6B3-3038-3793-8B5B-FFAF1B645D42}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.Debug|x64.ActiveCfg = Debug|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.Debug|x64.Build.0 = Debug|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.Release|x64.ActiveCfg = Release|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.Release|x64.Build.0 = Release|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{54609B1E-BC06-306E-9607-8EAEF1F4571E}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.Debug|x64.ActiveCfg = Debug|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.Debug|x64.Build.0 = Debug|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.Release|x64.ActiveCfg = Release|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.Release|x64.Build.0 = Release|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{3FD6A666-E15C-386C-9AAE-B352CA747977}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {59E64599-55C1-370C-BB8B-8DCA690BC7F5}
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
PcgsInvUi/ViewModels/ErrorWindowViewModel.cs
+2 -5
View File
@@ -1,6 +1,4 @@
using System.Reactive; using System.Reactive;
using System.Security.Principal;
using PcgsInvUi.Views;
using ReactiveUI; using ReactiveUI;
namespace PcgsInvUi.ViewModels; namespace PcgsInvUi.ViewModels;
@@ -11,16 +9,15 @@ public class ErrorWindowViewModel : ViewModelBase {
get => _message; get => _message;
set => this.RaiseAndSetIfChanged(ref _message, value); set => this.RaiseAndSetIfChanged(ref _message, value);
} }
private string _message; private string _message;
public ReactiveCommand<ErrorWindow, Unit> CloseCommand { get; } public ReactiveCommand<Unit, object> CloseCommand { get; }
public ErrorWindowViewModel(string message) public ErrorWindowViewModel(string message)
{ {
_message = message; _message = message;
CloseCommand = ReactiveCommand.Create<ErrorWindow>(window => window.Close()); CloseCommand = ReactiveCommand.Create(() => (object)false);
} }
} }
PcgsInvUi/ViewModels/MainWindowViewModel.cs
+3 -2
View File
@@ -42,7 +42,7 @@ public class MainWindowViewModel : ViewModelBase {
public Interaction<DeleteWindowViewModel, Boolean> ShowDeleteWindow { get; } public Interaction<DeleteWindowViewModel, Boolean> ShowDeleteWindow { get; }
public ReactiveCommand<Unit, Unit> ExportCommand { get; } public ReactiveCommand<Unit, Unit> ExportCommand { get; }
public Interaction<Unit, Uri> ShowExportWindow { get; } public Interaction<Unit, Uri> ShowExportWindow { get; }
public Interaction<ErrorWindowViewModel, Unit> ShowErrorWindow { get; } public Interaction<ErrorWindowViewModel, bool> ShowErrorWindow { get; }
private ViewModelBase _sideContent; private ViewModelBase _sideContent;
private Coin? _selectedCoin; private Coin? _selectedCoin;
@@ -57,7 +57,7 @@ public class MainWindowViewModel : ViewModelBase {
TotalValue = DisplayedList.Sum(x => x.TotalPrice); TotalValue = DisplayedList.Sum(x => x.TotalPrice);
// Set up the ability to show the error window. // Set up the ability to show the error window.
ShowErrorWindow = new Interaction<ErrorWindowViewModel, Unit>(); ShowErrorWindow = new Interaction<ErrorWindowViewModel, bool>();
// Set up the ability to open the delete window. // Set up the ability to open the delete window.
ShowDeleteWindow = new Interaction<DeleteWindowViewModel, bool>(); ShowDeleteWindow = new Interaction<DeleteWindowViewModel, bool>();
@@ -117,6 +117,7 @@ public class MainWindowViewModel : ViewModelBase {
}); });
// Change TotalValue anytime SelectedCoin.TotalPrice changes. // Change TotalValue anytime SelectedCoin.TotalPrice changes.
// TODO: fix this. Should update when a coin within the collection is changed.
// Possible null deref - how do you remove this? // Possible null deref - how do you remove this?
this.WhenAnyValue(x => x.SelectedCoin.TotalPrice) this.WhenAnyValue(x => x.SelectedCoin.TotalPrice)
.Subscribe(_ => TotalValue = ConnectedCoinDatabase.Collection.Sum(x => x.TotalPrice)); .Subscribe(_ => TotalValue = ConnectedCoinDatabase.Collection.Sum(x => x.TotalPrice));
PcgsInvUi/Views/ErrorWindow.axaml
+2 -3
View File
@@ -12,8 +12,7 @@
Margin="15" Margin="15"
Content="{Binding DisplayedMessage}" /> Content="{Binding DisplayedMessage}" />
<Button Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom" <Button Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Bottom"
Margin="10" Name="CloseButton" IsEnabled="False" Margin="10" Name="CloseButton" IsEnabled="True"
Content="Use X button" Command="{Binding CloseCommand, Mode=OneWay}" Content="OK" Command="{Binding CloseCommand, Mode=OneWay}" />
CommandParameter="{Binding ElementName=NameErrorWindow}"/>
</Grid> </Grid>
</Window> </Window>
PcgsInvUi/Views/ErrorWindow.axaml.cs
+3
View File
@@ -1,5 +1,7 @@
using System;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
using PcgsInvUi.ViewModels; using PcgsInvUi.ViewModels;
using ReactiveUI;
namespace PcgsInvUi.Views; namespace PcgsInvUi.Views;
@@ -7,5 +9,6 @@ public partial class ErrorWindow : ReactiveWindow<ErrorWindowViewModel> {
public ErrorWindow() public ErrorWindow()
{ {
InitializeComponent(); InitializeComponent();
this.WhenActivated(d => d(ViewModel!.CloseCommand.Subscribe(Close)));
} }
} }
PcgsInvUi/Views/MainWindow.axaml.cs
+4 -4
View File
@@ -18,7 +18,7 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel> {
// this.WhenActivated(d => d(ViewModel!.ShowFindWindow.RegisterHandler(ShowFindWindowAsync))); // this.WhenActivated(d => d(ViewModel!.ShowFindWindow.RegisterHandler(ShowFindWindowAsync)));
} }
private async Task ShowDeleteWindowAsync(InteractionContext<DeleteWindowViewModel, Boolean> interaction) { private async Task ShowDeleteWindowAsync(InteractionContext<DeleteWindowViewModel, bool> interaction) {
var window = new DeleteWindow(); var window = new DeleteWindow();
window.DataContext = interaction.Input; window.DataContext = interaction.Input;
@@ -53,11 +53,11 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel> {
} }
} }
private async Task ShowErrorWindowAsync(InteractionContext<ErrorWindowViewModel, Unit> interaction) { private async Task ShowErrorWindowAsync(InteractionContext<ErrorWindowViewModel, bool> interaction) {
var window = new ErrorWindow(); var window = new ErrorWindow();
window.DataContext = interaction.Input; window.DataContext = interaction.Input;
await window.ShowDialog(this); var result = await window.ShowDialog<bool>(this);
interaction.SetOutput(Unit.Default); interaction.SetOutput(result);
} }
} }