Fixed DeleteWindow and allowed it to close.
This commit is contained in:
1 parent
41667d9e0b
commit
663fb256e5
13 files changed
+355
-16
No files matched your search
@@ -2,3 +2,12 @@
|
|||||||
/PcgsInvUi/[Oo]bj/
|
/PcgsInvUi/[Oo]bj/
|
||||||
[Oo]bj/
|
[Oo]bj/
|
||||||
[Bb]in/
|
[Bb]in/
|
||||||
|
ALL_BUILD.vcxproj
|
||||||
|
ALL_BUILD.vcxproj.filters
|
||||||
|
ZERO_CHECK.vcxproj
|
||||||
|
ZERO_CHECK.vcxproj.filters
|
||||||
|
CMakeCache.txt
|
||||||
|
CMakeFiles/
|
||||||
|
.idea/
|
||||||
|
cmake_install.cmake
|
||||||
|
coin_collection
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.25)
|
||||||
|
|
||||||
|
project("PcgsInvUi" CSharp)
|
||||||
|
|
||||||
|
add_subdirectory(PcgsInvUi)
|
||||||
@@ -0,0 +1,224 @@
|
|||||||
|
<?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 "C:\Program Files\CMake\bin\cmake.exe" -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 if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone :cmErrorLevel exit /b %1 :cmDone if %errorlevel% neq 0 goto :VCEnd :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 "C:\Program Files\CMake\bin\cmake.exe" -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 if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone :cmErrorLevel exit /b %1 :cmDone if %errorlevel% neq 0 goto :VCEnd :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 "C:\Program Files\CMake\bin\cmake.exe" -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 if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone :cmErrorLevel exit /b %1 :cmDone if %errorlevel% neq 0 goto :VCEnd :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 "C:\Program Files\CMake\bin\cmake.exe" -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 if %errorlevel% neq 0 goto :cmEnd :cmEnd endlocal & call :cmErrorLevel %errorlevel% & goto :cmDone :cmErrorLevel exit /b %1 :cmDone if %errorlevel% neq 0 goto :VCEnd :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>
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
|
||||||
|
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
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.25)
|
||||||
|
|
||||||
|
project(PcgsInvUi LANGUAGES CSharp)
|
||||||
|
|
||||||
|
include(CSharpUtilities)
|
||||||
|
|
||||||
|
add_executable(PcgsInvUi
|
||||||
|
App.axaml.cs
|
||||||
|
Program.cs
|
||||||
|
ViewLocator.cs
|
||||||
|
App.axaml
|
||||||
|
app.manifest
|
||||||
|
Models/Coin.cs
|
||||||
|
Services/CoinCollection.cs
|
||||||
|
Services/CoinDatabase.cs
|
||||||
|
Services/PcgsClient.cs
|
||||||
|
ViewModels/CoinListViewModel.cs
|
||||||
|
ViewModels/DeleteWindowViewModel.cs
|
||||||
|
ViewModels/EditViewModel.cs
|
||||||
|
ViewModels/ErrorWindowViewModel.cs
|
||||||
|
ViewModels/FindWindowViewModel.cs
|
||||||
|
ViewModels/MainWindowViewModel.cs
|
||||||
|
ViewModels/NewViewModel.cs
|
||||||
|
ViewModels/ViewModelBase.cs
|
||||||
|
Views/DeleteWindow.axaml
|
||||||
|
Views/DeleteWindow.axaml.cs
|
||||||
|
Views/ErrorWindow.axaml
|
||||||
|
Views/ErrorWindow.axaml.cs
|
||||||
|
Views/FindWindow.axaml
|
||||||
|
Views/FindWindow.axaml.cs
|
||||||
|
Views/MainWindow.axaml
|
||||||
|
Views/MainWindow.axaml.cs
|
||||||
|
Views/NewView.axaml
|
||||||
|
Views/NewView.axaml.cs
|
||||||
|
)
|
||||||
|
|
||||||
|
# Set the .NET Framework version for the executable.
|
||||||
|
set_property(TARGET PcgsInvUi PROPERTY VS_DOTNET_TARGET_FRAMEWORK_VERSION "v4.7.2")
|
||||||
|
# Set the executable to be 64-bit.
|
||||||
|
set_property(TARGET PcgsInvUi PROPERTY WIN64_EXECUTABLE TRUE)
|
||||||
|
# Set the C# language version (defaults to 3.0)
|
||||||
|
set(CMAKE_CSharp_FLAGS "/langversion:latest")
|
||||||
|
|
||||||
|
# Add the .NET reference libraries as dependencies.
|
||||||
|
set_property(TARGET PcgsInvUi PROPERTY VS_DOTNET_REFERENCES
|
||||||
|
"Microsoft.CSharp"
|
||||||
|
)
|
||||||
@@ -37,14 +37,16 @@ public class CoinDatabase {
|
|||||||
|
|
||||||
private SQLiteConnection CreateConnection() {
|
private SQLiteConnection CreateConnection() {
|
||||||
// Check if database exists.
|
// Check if database exists.
|
||||||
if (!System.IO.File.Exists("%USERPROFILE%\\coin_collection")) {
|
if (!System.IO.File.Exists("coin_collection")) {
|
||||||
// Create the database.
|
// Create the database.
|
||||||
SQLiteConnection.CreateFile("%USERPROFILE%\\coin_collection");
|
Console.Write("Creating database... ");
|
||||||
|
SQLiteConnection.CreateFile("coin_collection");
|
||||||
|
Console.WriteLine("Done.");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a connection to the database.
|
// Create a connection to the database.
|
||||||
SQLiteConnection connection =
|
SQLiteConnection connection =
|
||||||
new SQLiteConnection("DataSource=%USERPROFILE%\\coin_collection");
|
new SQLiteConnection("DataSource=coin_collection");
|
||||||
|
|
||||||
// Open the connection.
|
// Open the connection.
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
using System.Reactive;
|
using System.Reactive;
|
||||||
using PcgsInvUi.Views;
|
|
||||||
using ReactiveUI;
|
using ReactiveUI;
|
||||||
|
|
||||||
namespace PcgsInvUi.ViewModels;
|
namespace PcgsInvUi.ViewModels;
|
||||||
|
|
||||||
public class DeleteWindowViewModel : ViewModelBase {
|
public class DeleteWindowViewModel : ViewModelBase {
|
||||||
public ReactiveCommand<Unit, object> OkCommand { get; }
|
public ReactiveCommand<Unit, object> OkCommand { get; }
|
||||||
public ReactiveCommand<DeleteWindow, Unit> CancelCommand { get; }
|
public ReactiveCommand<Unit, object> CancelCommand { get; }
|
||||||
|
|
||||||
public DeleteWindowViewModel() {
|
public DeleteWindowViewModel() {
|
||||||
OkCommand = ReactiveCommand.Create(() => (object)true);
|
OkCommand = ReactiveCommand.Create(() => (object)true);
|
||||||
CancelCommand = ReactiveCommand.Create<DeleteWindow>(window => window.Close());
|
CancelCommand = ReactiveCommand.Create(() => (object)false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System.Reactive;
|
||||||
using System.Reactive;
|
|
||||||
using PcgsInvUi.Models;
|
using PcgsInvUi.Models;
|
||||||
using ReactiveUI;
|
using ReactiveUI;
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public class ErrorWindowViewModel : ViewModelBase {
|
|||||||
|
|
||||||
public ErrorWindowViewModel(string message)
|
public ErrorWindowViewModel(string message)
|
||||||
{
|
{
|
||||||
DisplayedMessage = message;
|
_message = message;
|
||||||
|
|
||||||
CloseCommand = ReactiveCommand.Create<ErrorWindow>(window => window.Close());
|
CloseCommand = ReactiveCommand.Create<ErrorWindow>(window => window.Close());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ using ReactiveUI;
|
|||||||
|
|
||||||
namespace PcgsInvUi.ViewModels;
|
namespace PcgsInvUi.ViewModels;
|
||||||
|
|
||||||
|
// TODO Create proper sums for total value.
|
||||||
// TODO Error handling for API calls.
|
// TODO Error handling for API calls.
|
||||||
// TODO Manual handling of API key.
|
// TODO Manual handling of API key.
|
||||||
// TODO Use CoinFacts link.
|
// TODO Use CoinFacts link.
|
||||||
@@ -67,7 +68,7 @@ public class MainWindowViewModel : ViewModelBase {
|
|||||||
var result = await ShowDeleteWindow.Handle(deleteViewModel);
|
var result = await ShowDeleteWindow.Handle(deleteViewModel);
|
||||||
if (result && SelectedCoin is not null) {
|
if (result && SelectedCoin is not null) {
|
||||||
ConnectedCoinDatabase.DeleteCoin(SelectedCoin);
|
ConnectedCoinDatabase.DeleteCoin(SelectedCoin);
|
||||||
ConnectedCoinDatabase.Collection.Remove(SelectedCoin); // possible null deref - ignored due to button being disabled.
|
ConnectedCoinDatabase.Collection.Remove(SelectedCoin);
|
||||||
}
|
}
|
||||||
}, deleteEnabled);
|
}, deleteEnabled);
|
||||||
|
|
||||||
@@ -83,10 +84,10 @@ public class MainWindowViewModel : ViewModelBase {
|
|||||||
catch (IOException e) {
|
catch (IOException e) {
|
||||||
// Something is wrong with the file after it's been created.
|
// Something is wrong with the file after it's been created.
|
||||||
Console.WriteLine(e.Message);
|
Console.WriteLine(e.Message);
|
||||||
ShowErrorWindow.Handle(new ErrorWindowViewModel(e.Message));
|
await ShowErrorWindow.Handle(new ErrorWindowViewModel(e.Message));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Console.WriteLine(e.Message);
|
Console.WriteLine(e.Message);
|
||||||
ShowErrorWindow.Handle(new ErrorWindowViewModel(e.Message));
|
await ShowErrorWindow.Handle(new ErrorWindowViewModel(e.Message));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<Button Grid.Row="1" Grid.Column="1" Margin="5"
|
<Button Grid.Row="1" Grid.Column="1" Margin="5"
|
||||||
Width="100"
|
Width="100"
|
||||||
HorizontalAlignment="Stretch" VerticalAlignment="Center"
|
HorizontalAlignment="Stretch" VerticalAlignment="Center"
|
||||||
HorizontalContentAlignment="Center" IsEnabled="False"
|
HorizontalContentAlignment="Center" IsEnabled="True"
|
||||||
Content="Use X button" Command="{Binding CancelCommand}" />
|
Content="No" Command="{Binding CancelCommand}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -9,5 +9,6 @@ public partial class DeleteWindow : ReactiveWindow<DeleteWindowViewModel> {
|
|||||||
public DeleteWindow() {
|
public DeleteWindow() {
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
this.WhenActivated(d => d(ViewModel!.OkCommand.Subscribe(Close)));
|
this.WhenActivated(d => d(ViewModel!.OkCommand.Subscribe(Close)));
|
||||||
|
this.WhenActivated(d => d(ViewModel!.CancelCommand.Subscribe(Close)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,8 +5,7 @@
|
|||||||
xmlns:viewModels="clr-namespace:PcgsInvUi.ViewModels"
|
xmlns:viewModels="clr-namespace:PcgsInvUi.ViewModels"
|
||||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||||
x:Class="PcgsInvUi.Views.MainWindow" x:DataType="viewModels:MainWindowViewModel"
|
x:Class="PcgsInvUi.Views.MainWindow" x:DataType="viewModels:MainWindowViewModel"
|
||||||
Title="Main Window"
|
Title="Main Window" WindowStartupLocation="CenterScreen" WindowState="Maximized" >
|
||||||
WindowStartupLocation="CenterOwner">
|
|
||||||
<SplitView IsPaneOpen="True"
|
<SplitView IsPaneOpen="True"
|
||||||
DisplayMode="Inline"
|
DisplayMode="Inline"
|
||||||
PanePlacement="Right">
|
PanePlacement="Right">
|
||||||
|
|||||||
Reference in new issue
Block a user