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

Merge vas-working to master (attempt 2) #2

Merged
BobdaFett merged 28 commits from vas-working into master 2023-11-23 00:05:09 +00:00
Conversation 0 Commits 28 Files Changed 183
+11 -3
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41667d9e0b - Show all commits

No files matched your search

PcgsInvUi/PcgsInvUi.csproj
+1
View File
@@ -16,6 +16,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.5" /> <PackageReference Include="Avalonia" Version="11.0.5" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.5" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.5" /> <PackageReference Include="Avalonia.Desktop" Version="11.0.5" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" /> <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.5" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" /> <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.5" />
PcgsInvUi/Services/CoinDatabase.cs
+8 -2
View File
@@ -36,9 +36,15 @@ public class CoinDatabase {
} }
private SQLiteConnection CreateConnection() { private SQLiteConnection CreateConnection() {
// Create a connection. // Check if database exists.
if (!System.IO.File.Exists("%USERPROFILE%\\coin_collection")) {
// Create the database.
SQLiteConnection.CreateFile("%USERPROFILE%\\coin_collection");
}
// Create a connection to the database.
SQLiteConnection connection = SQLiteConnection connection =
new SQLiteConnection("DataSource=C:\\Users\\lvas4\\coin_collection"); new SQLiteConnection("DataSource=%USERPROFILE%\\coin_collection");
// Open the connection. // Open the connection.
try { try {
PcgsInvUi/Views/MainWindow.axaml
+1 -1
View File
@@ -5,7 +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="MainWindow" Title="Main Window"
WindowStartupLocation="CenterOwner"> WindowStartupLocation="CenterOwner">
<SplitView IsPaneOpen="True" <SplitView IsPaneOpen="True"
DisplayMode="Inline" DisplayMode="Inline"
pcgs-inv.sln
+1
View File
@@ -12,5 +12,6 @@ Global
{887D7BD0-3E71-435D-82CD-3DAF3187D056}.Debug|Any CPU.Build.0 = Debug|Any CPU {887D7BD0-3E71-435D-82CD-3DAF3187D056}.Debug|Any CPU.Build.0 = Debug|Any CPU
{887D7BD0-3E71-435D-82CD-3DAF3187D056}.Release|Any CPU.ActiveCfg = Release|Any CPU {887D7BD0-3E71-435D-82CD-3DAF3187D056}.Release|Any CPU.ActiveCfg = Release|Any CPU
{887D7BD0-3E71-435D-82CD-3DAF3187D056}.Release|Any CPU.Build.0 = Release|Any CPU {887D7BD0-3E71-435D-82CD-3DAF3187D056}.Release|Any CPU.Build.0 = Release|Any CPU
{887D7BD0-3E71-435D-82CD-3DAF3187D056}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal