Merge pull request 'feature/cuid' (#1) from feature/cuid into master
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
@@ -1,17 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<TargetFramework>net8.0-windows</TargetFramework>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
|
||||||
<ProjectGuid>{93CA258B-A645-41A8-A24F-59036ABC173F}</ProjectGuid>
|
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<RootNamespace>CarManagerV3</RootNamespace>
|
|
||||||
<AssemblyName>CarManagerV3</AssemblyName>
|
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
|
||||||
<FileAlignment>512</FileAlignment>
|
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
|
||||||
<Deterministic>true</Deterministic>
|
|
||||||
<PublishUrl>publish\</PublishUrl>
|
<PublishUrl>publish\</PublishUrl>
|
||||||
<Install>true</Install>
|
<Install>true</Install>
|
||||||
<InstallFrom>Disk</InstallFrom>
|
<InstallFrom>Disk</InstallFrom>
|
||||||
@@ -27,104 +17,17 @@
|
|||||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||||
<UseApplicationTrust>false</UseApplicationTrust>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||||
</PropertyGroup>
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
|
||||||
<DebugType>full</DebugType>
|
|
||||||
<Optimize>false</Optimize>
|
|
||||||
<OutputPath>bin\Debug\</OutputPath>
|
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
|
||||||
<DebugType>pdbonly</DebugType>
|
|
||||||
<Optimize>true</Optimize>
|
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
|
||||||
<ErrorReport>prompt</ErrorReport>
|
|
||||||
<WarningLevel>4</WarningLevel>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System" />
|
<Compile Update="Forms\Components\CarCard.cs">
|
||||||
<Reference Include="System.Core" />
|
|
||||||
<Reference Include="System.Xml.Linq" />
|
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
|
||||||
<Reference Include="Microsoft.CSharp" />
|
|
||||||
<Reference Include="System.Data" />
|
|
||||||
<Reference Include="System.Deployment" />
|
|
||||||
<Reference Include="System.Drawing" />
|
|
||||||
<Reference Include="System.Net.Http" />
|
|
||||||
<Reference Include="System.Windows.Forms" />
|
|
||||||
<Reference Include="System.Xml" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<Compile Include="Car.cs" />
|
|
||||||
<Compile Include="CarCard.cs">
|
|
||||||
<SubType>UserControl</SubType>
|
<SubType>UserControl</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="CarCard.Designer.cs">
|
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
||||||
<DependentUpon>CarCard.cs</DependentUpon>
|
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||||
</Compile>
|
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||||
<Compile Include="MainForm.cs">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="MainForm.Designer.cs">
|
|
||||||
<DependentUpon>MainForm.cs</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="CarDetailsForm.cs">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="CarDetailsForm.Designer.cs">
|
|
||||||
<DependentUpon>CarDetailsForm.cs</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="ImageManager.cs" />
|
|
||||||
<Compile Include="PleaseWait.cs">
|
|
||||||
<SubType>Form</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="PleaseWait.Designer.cs">
|
|
||||||
<DependentUpon>PleaseWait.cs</DependentUpon>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="Program.cs" />
|
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
|
||||||
<Compile Include="SafeManager.cs" />
|
|
||||||
<Compile Include="StateManager.cs" />
|
|
||||||
<EmbeddedResource Include="CarCard.resx">
|
|
||||||
<DependentUpon>CarCard.cs</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="MainForm.resx">
|
|
||||||
<DependentUpon>MainForm.cs</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="CarDetailsForm.resx">
|
|
||||||
<DependentUpon>CarDetailsForm.cs</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="PleaseWait.resx">
|
|
||||||
<DependentUpon>PleaseWait.cs</DependentUpon>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<EmbeddedResource Include="Properties\Resources.resx">
|
|
||||||
<Generator>ResXFileCodeGenerator</Generator>
|
|
||||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
|
||||||
<SubType>Designer</SubType>
|
|
||||||
</EmbeddedResource>
|
|
||||||
<Compile Include="Properties\Resources.Designer.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
|
||||||
<DesignTime>True</DesignTime>
|
|
||||||
</Compile>
|
|
||||||
<None Include="Properties\Settings.settings">
|
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
|
||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
|
||||||
</None>
|
|
||||||
<Compile Include="Properties\Settings.Designer.cs">
|
|
||||||
<AutoGen>True</AutoGen>
|
|
||||||
<DependentUpon>Settings.settings</DependentUpon>
|
|
||||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
|
||||||
</Compile>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="App.config" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
|
<BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
|
||||||
@@ -138,5 +41,4 @@
|
|||||||
<Install>false</Install>
|
<Install>false</Install>
|
||||||
</BootstrapperPackage>
|
</BootstrapperPackage>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using CarManagerV3.Util;
|
||||||
|
|
||||||
namespace CarManagerV3
|
namespace CarManagerV3
|
||||||
{
|
{
|
||||||
@@ -7,7 +8,7 @@ namespace CarManagerV3
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class Car
|
public class Car
|
||||||
{
|
{
|
||||||
private int id;
|
private string id;
|
||||||
private string make;
|
private string make;
|
||||||
private string model;
|
private string model;
|
||||||
private int year;
|
private int year;
|
||||||
@@ -16,14 +17,11 @@ namespace CarManagerV3
|
|||||||
private decimal price;
|
private decimal price;
|
||||||
private int order;
|
private int order;
|
||||||
|
|
||||||
public int Id { get => id;
|
public string Id { get => id; }
|
||||||
set {
|
|
||||||
if (value < 0) throw new ArgumentException("Id cannot be negative.");
|
|
||||||
id = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Make { get => make;
|
public string Make
|
||||||
|
{
|
||||||
|
get => make;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException("Make cannot be empty.");
|
if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException("Make cannot be empty.");
|
||||||
@@ -31,7 +29,9 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Model { get => model;
|
public string Model
|
||||||
|
{
|
||||||
|
get => model;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException("Model cannot be empty.");
|
if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException("Model cannot be empty.");
|
||||||
@@ -39,7 +39,9 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Year { get => year;
|
public int Year
|
||||||
|
{
|
||||||
|
get => year;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (value < 1886 || value > DateTime.Now.Year + 1) throw new ArgumentException("Year must be between 1886 and next year.");
|
if (value < 1886 || value > DateTime.Now.Year + 1) throw new ArgumentException("Year must be between 1886 and next year.");
|
||||||
@@ -47,7 +49,9 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Color { get => color;
|
public string Color
|
||||||
|
{
|
||||||
|
get => color;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException("Color cannot be empty.");
|
if (string.IsNullOrWhiteSpace(value)) throw new ArgumentException("Color cannot be empty.");
|
||||||
@@ -55,7 +59,9 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Mileage { get => mileage;
|
public int Mileage
|
||||||
|
{
|
||||||
|
get => mileage;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (value < 0) throw new ArgumentException("Mileage cannot be negative.");
|
if (value < 0) throw new ArgumentException("Mileage cannot be negative.");
|
||||||
@@ -63,7 +69,9 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public decimal Price { get => price;
|
public decimal Price
|
||||||
|
{
|
||||||
|
get => price;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (value < 0) throw new ArgumentException("Price cannot be negative.");
|
if (value < 0) throw new ArgumentException("Price cannot be negative.");
|
||||||
@@ -102,10 +110,24 @@ namespace CarManagerV3
|
|||||||
/// <param name="mileage">The current mileage on the car.</param>
|
/// <param name="mileage">The current mileage on the car.</param>
|
||||||
/// <param name="price">The selling-price of the car.</param>
|
/// <param name="price">The selling-price of the car.</param>
|
||||||
/// <param name="order">The order.</param>
|
/// <param name="order">The order.</param>
|
||||||
public Car(int id, string make, string model, int year, string color, int mileage, decimal price, int order = 0)
|
public Car(string id, string make, string model, int year, string color, int mileage, decimal price, int order = 0)
|
||||||
{
|
{
|
||||||
|
// is ID just a number? Then it is legacy and needs a new ID string.
|
||||||
|
int numericId = 0;
|
||||||
|
if ((string.IsNullOrWhiteSpace(id) || int.TryParse(id, out numericId)) && id != "0")
|
||||||
|
{
|
||||||
|
id = CUID.NewCUID().ToString();
|
||||||
|
if (numericId > 0)
|
||||||
|
{
|
||||||
|
order = numericId + order;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(id.Length > 8)
|
||||||
|
{
|
||||||
|
id = CUID.NewCUID().ToString();
|
||||||
|
}
|
||||||
// Sets the properties using the setters to ensure validation is applied.
|
// Sets the properties using the setters to ensure validation is applied.
|
||||||
this.Id = id;
|
this.id = id;
|
||||||
this.Make = make;
|
this.Make = make;
|
||||||
this.Model = model;
|
this.Model = model;
|
||||||
this.Year = year;
|
this.Year = year;
|
||||||
@@ -137,7 +159,7 @@ namespace CarManagerV3
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public string ToCsvString()
|
public string ToCsvString()
|
||||||
{
|
{
|
||||||
return $"{this.Id};{this.Make};{this.Model};{this.Year};{this.Color};{this.Mileage};{this.Price}";
|
return $"{this.Id};{this.Make};{this.Model};{this.Year};{this.Color};{this.Mileage};{this.Price};{this.Order}";
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: Add error handling for malformed CSV strings and detection for missing fields.
|
//TODO: Add error handling for malformed CSV strings and detection for missing fields.
|
||||||
@@ -156,10 +178,23 @@ namespace CarManagerV3
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
string[] parts = csv.Split(';');
|
string[] parts = csv.Split(';');
|
||||||
Car temp = new Car(int.Parse(parts[0]), parts[1], parts[2], int.Parse(parts[3]), parts[4], int.Parse(parts[5]), decimal.Parse(parts[6]));
|
// is part 7 a valid int? if not set it to 0 and log a warning.
|
||||||
if (temp.Year < 1886 || temp.Year > DateTime.Now.Year + 1) throw new Exception($"Invalid year: {temp.Year}");
|
if (parts.Length == 7)
|
||||||
if (temp.Mileage < 0) throw new Exception($"Mileage cannot be negative: {temp.Mileage}");
|
{
|
||||||
if (temp.Price < 0) throw new Exception($"Price cannot be negative: {temp.Price}");
|
Console.Error.WriteLine($"Warning: CSV string has only 7 fields, expected 8. Setting Order to 0. CSV: {csv}");
|
||||||
|
if (!StateManager.askForMigration())
|
||||||
|
{
|
||||||
|
throw new Exception("User declined migration. Cannot parse CSV string with missing Order field.");
|
||||||
|
}
|
||||||
|
Array.Resize(ref parts, 8);
|
||||||
|
parts[7] = "0";
|
||||||
|
}
|
||||||
|
else if (parts.Length != 8)
|
||||||
|
{
|
||||||
|
throw new FormatException($"CSV string has {parts.Length} fields, expected 8. CSV: {csv}");
|
||||||
|
}
|
||||||
|
|
||||||
|
Car temp = new Car(parts[0], parts[1], parts[2], int.Parse(parts[3]), parts[4], int.Parse(parts[5]), decimal.Parse(parts[6]), int.Parse(parts[7]));
|
||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -178,7 +213,7 @@ namespace CarManagerV3
|
|||||||
/// </returns>
|
/// </returns>
|
||||||
public bool IsChanged(Car other)
|
public bool IsChanged(Car other)
|
||||||
{
|
{
|
||||||
return this.Make != other.Make || this.Model != other.Model || this.Year != other.Year || this.Color != other.Color || this.Mileage != other.Mileage || this.Price != other.Price || this.Color != other.Color;
|
return this.Make != other.Make || this.Model != other.Model || this.Year != other.Year || this.Color != other.Color || this.Mileage != other.Mileage || this.Price != other.Price || this.Color != other.Color || this.Order != other.Order;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -187,7 +222,14 @@ namespace CarManagerV3
|
|||||||
/// <returns>An identical but seperate <see cref="Car"/></returns>
|
/// <returns>An identical but seperate <see cref="Car"/></returns>
|
||||||
public Car Clone()
|
public Car Clone()
|
||||||
{
|
{
|
||||||
return new Car(this.Id, this.Make, this.Model, this.Year, this.Color, this.Mileage, this.Price);
|
return new Car(this.Id, this.Make, this.Model, this.Year, this.Color, this.Mileage, this.Price, this.Order);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static bool isLegacyCsvString(string csv)
|
||||||
|
{
|
||||||
|
string[] parts = csv.Split(';');
|
||||||
|
return parts.Length == 7; // Legacy format has 7 fields, new format has 8 fields (with Order).
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
16
CarManagerV3/Exceptions/LegacyException.cs
Normal file
16
CarManagerV3/Exceptions/LegacyException.cs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace CarManagerV3
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// LegacyException is a custom exception class used to indicate that a file is in a legacy format that cannot be read by the current version of the application. It is thrown when the SafeManager encounters a file format that it does not recognize, allowing the application to handle this specific case separately from other types of exceptions.
|
||||||
|
/// </summary>
|
||||||
|
/// <seealso cref="System.Exception" />
|
||||||
|
internal class LegacyException : Exception
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,7 +21,7 @@ namespace CarManagerV3
|
|||||||
nudPrice.Value = car.Price;
|
nudPrice.Value = car.Price;
|
||||||
tbxAge.Text = car.AgeString;
|
tbxAge.Text = car.AgeString;
|
||||||
pbxCarImage.Image = ImageManager.GetImage(car);
|
pbxCarImage.Image = ImageManager.GetImage(car);
|
||||||
if (car.Id == 0)
|
if (car.Id == "0")
|
||||||
{
|
{
|
||||||
lblID.Text = "New Car";
|
lblID.Text = "New Car";
|
||||||
}
|
}
|
||||||
@@ -125,7 +125,7 @@ namespace CarManagerV3
|
|||||||
msgbox.Show();
|
msgbox.Show();
|
||||||
await Task.Run(() =>
|
await Task.Run(() =>
|
||||||
{
|
{
|
||||||
if(car.Id == 0) {
|
if(car.Id == "0") {
|
||||||
car = StateManager.CreateCar(car.Make, car.Model, car.Year, car.Color, car.Mileage, car.Price);
|
car = StateManager.CreateCar(car.Make, car.Model, car.Year, car.Color, car.Mileage, car.Price);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -145,7 +145,7 @@ namespace CarManagerV3
|
|||||||
|
|
||||||
private void btnDelete_Click(object sender, EventArgs e)
|
private void btnDelete_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if(car.Id == 0)
|
if(car.Id == "0")
|
||||||
{
|
{
|
||||||
//just close form if car is not saved yet
|
//just close form if car is not saved yet
|
||||||
this.Close();
|
this.Close();
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
// lblCarDetails
|
// lblCarDetails
|
||||||
//
|
//
|
||||||
this.lblCarDetails.AutoSize = true;
|
this.lblCarDetails.AutoSize = true;
|
||||||
this.lblCarDetails.Location = new System.Drawing.Point(3, 184);
|
this.lblCarDetails.Location = new System.Drawing.Point(3, 174);
|
||||||
this.lblCarDetails.Name = "lblCarDetails";
|
this.lblCarDetails.Name = "lblCarDetails";
|
||||||
this.lblCarDetails.Size = new System.Drawing.Size(101, 16);
|
this.lblCarDetails.Size = new System.Drawing.Size(101, 16);
|
||||||
this.lblCarDetails.TabIndex = 5;
|
this.lblCarDetails.TabIndex = 5;
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
this.lblCarName.Font = new System.Drawing.Font("Arial", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
this.lblCarName.Font = new System.Drawing.Font("Arial", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||||
this.lblCarName.Location = new System.Drawing.Point(3, 130);
|
this.lblCarName.Location = new System.Drawing.Point(3, 130);
|
||||||
this.lblCarName.Name = "lblCarName";
|
this.lblCarName.Name = "lblCarName";
|
||||||
this.lblCarName.Size = new System.Drawing.Size(204, 54);
|
this.lblCarName.Size = new System.Drawing.Size(204, 44);
|
||||||
this.lblCarName.TabIndex = 4;
|
this.lblCarName.TabIndex = 4;
|
||||||
this.lblCarName.Text = "Skoda Fabia fdsdfsdfsdfsdf";
|
this.lblCarName.Text = "Skoda Fabia fdsdfsdfsdfsdf";
|
||||||
this.lblCarName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
this.lblCarName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||||
@@ -38,12 +38,14 @@ namespace CarManagerV3
|
|||||||
|
|
||||||
foreach (Control ctrl in this.Controls)
|
foreach (Control ctrl in this.Controls)
|
||||||
{
|
{
|
||||||
ctrl.Click += ForwardClick;
|
ctrl.MouseClick += ForwardClick;
|
||||||
foreach (Control inner in ctrl.Controls) // In case you have nested controls
|
foreach (Control inner in ctrl.Controls)
|
||||||
inner.Click += ForwardClick;
|
{
|
||||||
|
inner.MouseClick += ForwardClick;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
this.Click += (s, e) => this.OnCardClicked();
|
this.MouseClick += (s, e) => this.OnCardClicked(s, e);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async void LoadImage()
|
public async void LoadImage()
|
||||||
@@ -59,15 +61,22 @@ namespace CarManagerV3
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ForwardClick(object sender, EventArgs e)
|
private void ForwardClick(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
// Raise your CardClicked event no matter what got clicked
|
// Raise your CardClicked event no matter what got clicked
|
||||||
|
if (e.Button == MouseButtons.Right) return;
|
||||||
|
|
||||||
|
Console.WriteLine($"Forwarding click from {sender.GetType().Name}");
|
||||||
CardClicked?.Invoke(this, EventArgs.Empty);
|
CardClicked?.Invoke(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
|
|
||||||
public event EventHandler CardClicked;
|
public event EventHandler CardClicked;
|
||||||
private void OnCardClicked()
|
private void OnCardClicked(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
|
Console.WriteLine($"Card clicked at {e.Location} with button {e.Button}");
|
||||||
|
if (e.Button == MouseButtons.Right) return;
|
||||||
|
Console.WriteLine($"Card clicked: {this.CarName}");
|
||||||
|
|
||||||
if (this.CardClicked != null)
|
if (this.CardClicked != null)
|
||||||
{
|
{
|
||||||
this.CardClicked(this, EventArgs.Empty);
|
this.CardClicked(this, EventArgs.Empty);
|
||||||
@@ -121,7 +121,7 @@
|
|||||||
<data name="pbxCar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="pbxCar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAABLAAAALuCAYAAAC+de9yAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
|
iVBORw0KGgoAAAANSUhEUgAABLAAAALuCAYAAAC+de9yAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
|
||||||
EgAACxIB0t1+/AAA/7JJREFUeF7s/fuXZ8dZ349K5gs2dggQCJeYXAADx+IWooRLwsUc8Jc44QBfgpwE
|
EQAACxEBf2RfkQAA/7JJREFUeF7s/fuXZ8dZ349K5gs2dggQCJeYXAADx+IWooRLwsUc8Jc44QBfgpwE
|
||||||
MNiAbQIYI3yRrZHUv50VlhewCHG8tIyQLVmyaY/m0jM9PT09Mz33W3dPT09Pz4zGwsn5S3RWXZ6n3s+7
|
MNiAbQIYI3yRrZHUv50VlhewCHG8tIyQLVmyaY/m0jM9PT09Mz33W3dPT09Pz4zGwsn5S3RWXZ6n3s+7
|
||||||
an96ZBvb2O/3Ws/au+61a9duTb30VH3uuUeSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
an96ZBvb2O/3Ws/au+61a9duTb30VH3uuUeSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
||||||
JEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
JEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
||||||
@@ -5505,7 +5505,7 @@
|
|||||||
<data name="pbxCar.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="pbxCar.InitialImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
iVBORw0KGgoAAAANSUhEUgAABLAAAALuCAYAAAC+de9yAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
|
iVBORw0KGgoAAAANSUhEUgAABLAAAALuCAYAAAC+de9yAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
|
||||||
EgAACxIB0t1+/AAA/7JJREFUeF7s/fuXZ8dZ349K5gs2dggQCJeYXAADx+IWooRLwsUc8Jc44QBfgpwE
|
EQAACxEBf2RfkQAA/7JJREFUeF7s/fuXZ8dZ349K5gs2dggQCJeYXAADx+IWooRLwsUc8Jc44QBfgpwE
|
||||||
MNiAbQIYI3yRrZHUv50VlhewCHG8tIyQLVmyaY/m0jM9PT09Mz33W3dPT09Pz4zGwsn5S3RWXZ6n3s+7
|
MNiAbQIYI3yRrZHUv50VlhewCHG8tIyQLVmyaY/m0jM9PT09Mz33W3dPT09Pz4zGwsn5S3RWXZ6n3s+7
|
||||||
an96ZBvb2O/3Ws/au+61a9duTb30VH3uuUeSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
an96ZBvb2O/3Ws/au+61a9duTb30VH3uuUeSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
||||||
JEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
JEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS
|
||||||
215
CarManagerV3/Forms/MainForm.Designer.cs
generated
Normal file
215
CarManagerV3/Forms/MainForm.Designer.cs
generated
Normal file
@@ -0,0 +1,215 @@
|
|||||||
|
namespace CarManagerV3
|
||||||
|
{
|
||||||
|
partial class MainForm
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
||||||
|
tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
||||||
|
flpCars = new System.Windows.Forms.FlowLayoutPanel();
|
||||||
|
tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
|
||||||
|
tbxSearch = new System.Windows.Forms.TextBox();
|
||||||
|
btnNewCar = new System.Windows.Forms.Button();
|
||||||
|
menuStrip1 = new System.Windows.Forms.MenuStrip();
|
||||||
|
fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
recentFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
revealInFileExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
tableLayoutPanel1.SuspendLayout();
|
||||||
|
tableLayoutPanel2.SuspendLayout();
|
||||||
|
menuStrip1.SuspendLayout();
|
||||||
|
SuspendLayout();
|
||||||
|
//
|
||||||
|
// tableLayoutPanel1
|
||||||
|
//
|
||||||
|
tableLayoutPanel1.ColumnCount = 1;
|
||||||
|
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||||
|
tableLayoutPanel1.Controls.Add(flpCars, 0, 2);
|
||||||
|
tableLayoutPanel1.Controls.Add(tableLayoutPanel2, 0, 1);
|
||||||
|
tableLayoutPanel1.Controls.Add(menuStrip1, 0, 0);
|
||||||
|
tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
|
||||||
|
tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||||
|
tableLayoutPanel1.Name = "tableLayoutPanel1";
|
||||||
|
tableLayoutPanel1.RowCount = 3;
|
||||||
|
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||||
|
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F));
|
||||||
|
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
||||||
|
tableLayoutPanel1.Size = new System.Drawing.Size(802, 572);
|
||||||
|
tableLayoutPanel1.TabIndex = 0;
|
||||||
|
tableLayoutPanel1.Paint += tableLayoutPanel1_Paint;
|
||||||
|
//
|
||||||
|
// flpCars
|
||||||
|
//
|
||||||
|
flpCars.AutoScroll = true;
|
||||||
|
flpCars.AutoScrollMargin = new System.Drawing.Size(0, 200);
|
||||||
|
flpCars.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
flpCars.Location = new System.Drawing.Point(3, 82);
|
||||||
|
flpCars.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||||
|
flpCars.Name = "flpCars";
|
||||||
|
flpCars.Size = new System.Drawing.Size(796, 515);
|
||||||
|
flpCars.TabIndex = 1;
|
||||||
|
//
|
||||||
|
// tableLayoutPanel2
|
||||||
|
//
|
||||||
|
tableLayoutPanel2.ColumnCount = 2;
|
||||||
|
tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
|
||||||
|
tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
|
||||||
|
tableLayoutPanel2.Controls.Add(tbxSearch, 0, 0);
|
||||||
|
tableLayoutPanel2.Controls.Add(btnNewCar, 1, 0);
|
||||||
|
tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
tableLayoutPanel2.Location = new System.Drawing.Point(3, 32);
|
||||||
|
tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||||
|
tableLayoutPanel2.Name = "tableLayoutPanel2";
|
||||||
|
tableLayoutPanel2.RowCount = 1;
|
||||||
|
tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||||
|
tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 42F));
|
||||||
|
tableLayoutPanel2.Size = new System.Drawing.Size(796, 42);
|
||||||
|
tableLayoutPanel2.TabIndex = 2;
|
||||||
|
//
|
||||||
|
// tbxSearch
|
||||||
|
//
|
||||||
|
tbxSearch.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
tbxSearch.Location = new System.Drawing.Point(3, 4);
|
||||||
|
tbxSearch.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||||
|
tbxSearch.Name = "tbxSearch";
|
||||||
|
tbxSearch.Size = new System.Drawing.Size(392, 27);
|
||||||
|
tbxSearch.TabIndex = 3;
|
||||||
|
tbxSearch.TextChanged += tbxSearch_TextChanged;
|
||||||
|
//
|
||||||
|
// btnNewCar
|
||||||
|
//
|
||||||
|
btnNewCar.Location = new System.Drawing.Point(401, 4);
|
||||||
|
btnNewCar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||||
|
btnNewCar.Name = "btnNewCar";
|
||||||
|
btnNewCar.Size = new System.Drawing.Size(75, 29);
|
||||||
|
btnNewCar.TabIndex = 4;
|
||||||
|
btnNewCar.Text = "Add Car";
|
||||||
|
btnNewCar.UseVisualStyleBackColor = true;
|
||||||
|
btnNewCar.Click += btnNewCar_Click;
|
||||||
|
//
|
||||||
|
// menuStrip1
|
||||||
|
//
|
||||||
|
menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
|
||||||
|
menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem });
|
||||||
|
menuStrip1.Location = new System.Drawing.Point(0, 0);
|
||||||
|
menuStrip1.Name = "menuStrip1";
|
||||||
|
menuStrip1.Size = new System.Drawing.Size(802, 28);
|
||||||
|
menuStrip1.TabIndex = 3;
|
||||||
|
menuStrip1.Text = "menuStrip1";
|
||||||
|
//
|
||||||
|
// fileToolStripMenuItem
|
||||||
|
//
|
||||||
|
fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { openToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, importToolStripMenuItem, recentFilesToolStripMenuItem, revealInFileExplorerToolStripMenuItem });
|
||||||
|
fileToolStripMenuItem.Name = "fileToolStripMenuItem";
|
||||||
|
fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24);
|
||||||
|
fileToolStripMenuItem.Text = "File";
|
||||||
|
//
|
||||||
|
// openToolStripMenuItem
|
||||||
|
//
|
||||||
|
openToolStripMenuItem.Name = "openToolStripMenuItem";
|
||||||
|
openToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
||||||
|
openToolStripMenuItem.Text = "Open";
|
||||||
|
openToolStripMenuItem.Click += openToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// saveToolStripMenuItem
|
||||||
|
//
|
||||||
|
saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
||||||
|
saveToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
||||||
|
saveToolStripMenuItem.Text = "Save";
|
||||||
|
saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// saveAsToolStripMenuItem
|
||||||
|
//
|
||||||
|
saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
|
||||||
|
saveAsToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
||||||
|
saveAsToolStripMenuItem.Text = "Save as";
|
||||||
|
saveAsToolStripMenuItem.Click += saveAsToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// importToolStripMenuItem
|
||||||
|
//
|
||||||
|
importToolStripMenuItem.Name = "importToolStripMenuItem";
|
||||||
|
importToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
||||||
|
importToolStripMenuItem.Text = "Import";
|
||||||
|
importToolStripMenuItem.Click += importToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// recentFilesToolStripMenuItem
|
||||||
|
//
|
||||||
|
recentFilesToolStripMenuItem.Name = "recentFilesToolStripMenuItem";
|
||||||
|
recentFilesToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
||||||
|
recentFilesToolStripMenuItem.Text = "Recent Files";
|
||||||
|
recentFilesToolStripMenuItem.Click += recentFilesToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// revealInFileExplorerToolStripMenuItem
|
||||||
|
//
|
||||||
|
revealInFileExplorerToolStripMenuItem.Name = "revealInFileExplorerToolStripMenuItem";
|
||||||
|
revealInFileExplorerToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
||||||
|
revealInFileExplorerToolStripMenuItem.Text = "Reveal in File Explorer";
|
||||||
|
revealInFileExplorerToolStripMenuItem.Click += revealInFileExplorerToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
|
// MainForm
|
||||||
|
//
|
||||||
|
AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
|
||||||
|
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
ClientSize = new System.Drawing.Size(802, 572);
|
||||||
|
Controls.Add(tableLayoutPanel1);
|
||||||
|
Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon");
|
||||||
|
MainMenuStrip = menuStrip1;
|
||||||
|
Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||||
|
MinimumSize = new System.Drawing.Size(818, 609);
|
||||||
|
Name = "MainForm";
|
||||||
|
Text = "Carmanager 3";
|
||||||
|
tableLayoutPanel1.ResumeLayout(false);
|
||||||
|
tableLayoutPanel1.PerformLayout();
|
||||||
|
tableLayoutPanel2.ResumeLayout(false);
|
||||||
|
tableLayoutPanel2.PerformLayout();
|
||||||
|
menuStrip1.ResumeLayout(false);
|
||||||
|
menuStrip1.PerformLayout();
|
||||||
|
ResumeLayout(false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
|
||||||
|
private System.Windows.Forms.FlowLayoutPanel flpCars;
|
||||||
|
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
|
||||||
|
private System.Windows.Forms.TextBox tbxSearch;
|
||||||
|
private System.Windows.Forms.Button btnNewCar;
|
||||||
|
private System.Windows.Forms.MenuStrip menuStrip1;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem recentFilesToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem revealInFileExplorerToolStripMenuItem;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -25,13 +25,28 @@ namespace CarManagerV3
|
|||||||
|
|
||||||
SafeManager.InitializeFile(filepath);
|
SafeManager.InitializeFile(filepath);
|
||||||
StateManager.setFilePath(filepath);
|
StateManager.setFilePath(filepath);
|
||||||
List<Car> _cars = SafeManager.ReadCars(filepath);
|
try
|
||||||
|
{
|
||||||
|
List<Car> _cars = SafeManager.ReadCars(filepath);
|
||||||
|
cars = _cars;
|
||||||
|
refreshCars(_cars, false);
|
||||||
|
}
|
||||||
|
catch (LegacyException)
|
||||||
|
{
|
||||||
|
Console.Error.WriteLine("Legacy file format detected. Prompting user to select a new file.");
|
||||||
|
showOpenFileDialog();
|
||||||
|
}
|
||||||
|
|
||||||
refreshCars(_cars);
|
|
||||||
refreshRecents();
|
refreshRecents();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void showOpenFileDialog()
|
||||||
|
{
|
||||||
|
openToolStripMenuItem.PerformClick();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Refreshes the cars displayed in the flow layout panel.
|
/// Refreshes the cars displayed in the flow layout panel.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -43,7 +58,7 @@ namespace CarManagerV3
|
|||||||
this.Text = "Car Manager - " + System.IO.Path.GetFileName(filepath);
|
this.Text = "Car Manager - " + System.IO.Path.GetFileName(filepath);
|
||||||
|
|
||||||
// Sort by Car.Order. If equal, sort by ID
|
// Sort by Car.Order. If equal, sort by ID
|
||||||
_cars = _cars.Count > 0 ? _cars.OrderBy(c => c.Order).ThenBy(c => c.Id).ToList() : _cars;
|
_cars = _cars.Count > 0 ? _cars.OrderBy(c => c.Order).ToList() : _cars;
|
||||||
|
|
||||||
if (updateGlobal)
|
if (updateGlobal)
|
||||||
{
|
{
|
||||||
@@ -66,7 +81,7 @@ namespace CarManagerV3
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// compare details
|
// compare details
|
||||||
Console.WriteLine($"[L] Checking car: {car.Id} | Car Color: {car.Color} | Ex Color: {existingCar.Color}");
|
// Console.WriteLine($"[L] Checking car: {car.Id} | Car Color: {car.Color} | Ex Color: {existingCar.Color}");
|
||||||
if (existingCar.IsChanged(car))
|
if (existingCar.IsChanged(car))
|
||||||
{
|
{
|
||||||
Console.WriteLine($"[L] Updating car: {car.Id}");
|
Console.WriteLine($"[L] Updating car: {car.Id}");
|
||||||
@@ -77,14 +92,14 @@ namespace CarManagerV3
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// no changes
|
// no changes
|
||||||
Console.WriteLine($"[L] No changes for car: {car.Id}");
|
// Console.WriteLine($"[L] No changes for car: {car.Id}");
|
||||||
flpCars.Controls.SetChildIndex(existing, _cars.IndexOf(car));
|
flpCars.Controls.SetChildIndex(existing, _cars.IndexOf(car));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
card.CarName = $"{car.Make} {car.Model}";
|
card.CarName = $"{car.Make} {car.Model}";
|
||||||
card.CarDetails = $"{car.Year}, {car.Mileage} km, ${car.Price}";
|
card.CarDetails = $"({car.Order}) {car.Year}, {car.Mileage} km, ${car.Price}";
|
||||||
card.Car = car.Clone();
|
card.Car = car.Clone();
|
||||||
card.LoadImage();
|
card.LoadImage();
|
||||||
// clear existing event handlers to prevent multiple subscriptions
|
// clear existing event handlers to prevent multiple subscriptions
|
||||||
@@ -112,6 +127,43 @@ namespace CarManagerV3
|
|||||||
detailsForm.ShowDialog();
|
detailsForm.ShowDialog();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
ContextMenuStrip cms = new ContextMenuStrip();
|
||||||
|
cms.Items.Add("Move up", null, (s, e) =>
|
||||||
|
{
|
||||||
|
int order = car.Order;
|
||||||
|
// find car with order just less than this one
|
||||||
|
Car other = cars.Where(c => c.Order < order).OrderByDescending(c => c.Order).FirstOrDefault();
|
||||||
|
if (other != null)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Swapping order of {car.ToString()} ({car.Order}) and {other.ToString()} ({other.Order})");
|
||||||
|
int temp = car.Order;
|
||||||
|
car.Order = other.Order;
|
||||||
|
other.Order = temp;
|
||||||
|
cars = StateManager.normalizeOrders(cars);
|
||||||
|
SafeManager.SaveCars(filepath, cars);
|
||||||
|
refreshCars(cars);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
cms.Items.Add("Move down", null, (s, e) =>
|
||||||
|
{
|
||||||
|
int order = car.Order;
|
||||||
|
// find car with order just greater than this one
|
||||||
|
Car other = cars.Where(c => c.Order > order).OrderBy(c => c.Order).FirstOrDefault();
|
||||||
|
if (other != null)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Swapping order of {car.ToString()} ({car.Order}) and {other.ToString()} ({other.Order})");
|
||||||
|
int temp = car.Order;
|
||||||
|
car.Order = other.Order;
|
||||||
|
other.Order = temp;
|
||||||
|
cars = StateManager.normalizeOrders(cars);
|
||||||
|
SafeManager.SaveCars(filepath, cars);
|
||||||
|
refreshCars(cars);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
card.ContextMenuStrip = cms;
|
||||||
|
|
||||||
if (isNew)
|
if (isNew)
|
||||||
{
|
{
|
||||||
flpCars.Controls.Add(card);
|
flpCars.Controls.Add(card);
|
||||||
@@ -135,7 +187,7 @@ namespace CarManagerV3
|
|||||||
|
|
||||||
private void btnNewCar_Click(object sender, EventArgs e)
|
private void btnNewCar_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Car foocar = new Car(0, "New", "Car", 2020, "White", 0, 20000);
|
Car foocar = new Car("0", "New", "Car", 2020, "White", 0, 20000);
|
||||||
CarDetailsForm detailsForm = new CarDetailsForm(foocar);
|
CarDetailsForm detailsForm = new CarDetailsForm(foocar);
|
||||||
detailsForm.FormClosed += (s2, e2) =>
|
detailsForm.FormClosed += (s2, e2) =>
|
||||||
{
|
{
|
||||||
@@ -204,7 +256,7 @@ namespace CarManagerV3
|
|||||||
dlgOpen.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
dlgOpen.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
||||||
dlgOpen.Title = "Open Car Data File";
|
dlgOpen.Title = "Open Car Data File";
|
||||||
// Default to users documents
|
// Default to users documents
|
||||||
dlgOpen.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
dlgOpen.InitialDirectory = SafeManager.getRecentFolder();
|
||||||
|
|
||||||
DialogResult result = dlgOpen.ShowDialog();
|
DialogResult result = dlgOpen.ShowDialog();
|
||||||
if (result == DialogResult.OK)
|
if (result == DialogResult.OK)
|
||||||
@@ -226,6 +278,10 @@ namespace CarManagerV3
|
|||||||
SafeManager.AddRecentPath(filepath);
|
SafeManager.AddRecentPath(filepath);
|
||||||
refreshRecents();
|
refreshRecents();
|
||||||
}
|
}
|
||||||
|
catch (LegacyException)
|
||||||
|
{
|
||||||
|
showOpenFileDialog();
|
||||||
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show("Error loading file: " + ex.Message);
|
MessageBox.Show("Error loading file: " + ex.Message);
|
||||||
@@ -246,7 +302,7 @@ namespace CarManagerV3
|
|||||||
dlgSave.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
dlgSave.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
||||||
dlgSave.Title = "Save Car Data File As";
|
dlgSave.Title = "Save Car Data File As";
|
||||||
// Default to users documents
|
// Default to users documents
|
||||||
dlgSave.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
dlgSave.InitialDirectory = SafeManager.getRecentFolder();
|
||||||
DialogResult result = dlgSave.ShowDialog();
|
DialogResult result = dlgSave.ShowDialog();
|
||||||
|
|
||||||
if (result == DialogResult.OK)
|
if (result == DialogResult.OK)
|
||||||
@@ -279,7 +335,7 @@ namespace CarManagerV3
|
|||||||
dlgOpen.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
dlgOpen.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
||||||
dlgOpen.Title = "Import Car Data File";
|
dlgOpen.Title = "Import Car Data File";
|
||||||
// Default to users documents
|
// Default to users documents
|
||||||
dlgOpen.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
dlgOpen.InitialDirectory = SafeManager.getRecentFolder();
|
||||||
DialogResult dlgResult = dlgOpen.ShowDialog();
|
DialogResult dlgResult = dlgOpen.ShowDialog();
|
||||||
if (dlgResult == DialogResult.OK)
|
if (dlgResult == DialogResult.OK)
|
||||||
{
|
{
|
||||||
@@ -294,13 +350,6 @@ namespace CarManagerV3
|
|||||||
// merge cars
|
// merge cars
|
||||||
foreach (Car car in importedCars)
|
foreach (Car car in importedCars)
|
||||||
{
|
{
|
||||||
// check if car with same ID exists
|
|
||||||
if (cars.Any(c => c.Id == car.Id))
|
|
||||||
{
|
|
||||||
// assign new ID
|
|
||||||
int newId = cars.Count > 0 ? cars.Max(c => c.Id) + 1 : 1;
|
|
||||||
car.Id = newId;
|
|
||||||
}
|
|
||||||
cars.Add(car);
|
cars.Add(car);
|
||||||
}
|
}
|
||||||
DialogResult mergeAsNewFileResult = MessageBox.Show("Do you want to save the merged cars as a new file?", "Save As New File", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
|
DialogResult mergeAsNewFileResult = MessageBox.Show("Do you want to save the merged cars as a new file?", "Save As New File", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
|
||||||
@@ -310,7 +359,7 @@ namespace CarManagerV3
|
|||||||
dlgSave.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
dlgSave.Filter = "CSV Files (*.csv)|*.csv|All Files (*.*)|*.*";
|
||||||
dlgSave.Title = "Save Merged Car Data File As";
|
dlgSave.Title = "Save Merged Car Data File As";
|
||||||
// Default to users documents
|
// Default to users documents
|
||||||
dlgSave.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
dlgSave.InitialDirectory = SafeManager.getRecentFolder();
|
||||||
DialogResult saveResult = dlgSave.ShowDialog();
|
DialogResult saveResult = dlgSave.ShowDialog();
|
||||||
if (saveResult == DialogResult.OK)
|
if (saveResult == DialogResult.OK)
|
||||||
{
|
{
|
||||||
@@ -330,6 +379,10 @@ namespace CarManagerV3
|
|||||||
refreshCars(cars);
|
refreshCars(cars);
|
||||||
MessageBox.Show("File imported successfully.", "Import File", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
MessageBox.Show("File imported successfully.", "Import File", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
}
|
}
|
||||||
|
catch (LegacyException)
|
||||||
|
{
|
||||||
|
MessageBox.Show("The file you are trying to import is in a legacy format that is no longer supported. Please convert the file to the new format and try again.", "Import Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show("Error importing file: " + ex.Message);
|
MessageBox.Show("Error importing file: " + ex.Message);
|
||||||
216
CarManagerV3/MainForm.Designer.cs
generated
216
CarManagerV3/MainForm.Designer.cs
generated
@@ -1,216 +0,0 @@
|
|||||||
namespace CarManagerV3
|
|
||||||
{
|
|
||||||
partial class MainForm
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Required designer variable.
|
|
||||||
/// </summary>
|
|
||||||
private System.ComponentModel.IContainer components = null;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Clean up any resources being used.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
|
||||||
protected override void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (disposing && (components != null))
|
|
||||||
{
|
|
||||||
components.Dispose();
|
|
||||||
}
|
|
||||||
base.Dispose(disposing);
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Windows Form Designer generated code
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Required method for Designer support - do not modify
|
|
||||||
/// the contents of this method with the code editor.
|
|
||||||
/// </summary>
|
|
||||||
private void InitializeComponent()
|
|
||||||
{
|
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
|
||||||
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
|
|
||||||
this.flpCars = new System.Windows.Forms.FlowLayoutPanel();
|
|
||||||
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
|
|
||||||
this.tbxSearch = new System.Windows.Forms.TextBox();
|
|
||||||
this.btnNewCar = new System.Windows.Forms.Button();
|
|
||||||
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
|
|
||||||
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.recentFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.revealInFileExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
|
||||||
this.tableLayoutPanel1.SuspendLayout();
|
|
||||||
this.tableLayoutPanel2.SuspendLayout();
|
|
||||||
this.menuStrip1.SuspendLayout();
|
|
||||||
this.SuspendLayout();
|
|
||||||
//
|
|
||||||
// tableLayoutPanel1
|
|
||||||
//
|
|
||||||
this.tableLayoutPanel1.ColumnCount = 1;
|
|
||||||
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
|
||||||
this.tableLayoutPanel1.Controls.Add(this.flpCars, 0, 2);
|
|
||||||
this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 1);
|
|
||||||
this.tableLayoutPanel1.Controls.Add(this.menuStrip1, 0, 0);
|
|
||||||
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
|
|
||||||
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
|
|
||||||
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
|
|
||||||
this.tableLayoutPanel1.RowCount = 3;
|
|
||||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
|
||||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
|
|
||||||
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
|
|
||||||
this.tableLayoutPanel1.Size = new System.Drawing.Size(802, 458);
|
|
||||||
this.tableLayoutPanel1.TabIndex = 0;
|
|
||||||
this.tableLayoutPanel1.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanel1_Paint);
|
|
||||||
//
|
|
||||||
// flpCars
|
|
||||||
//
|
|
||||||
this.flpCars.AutoScroll = true;
|
|
||||||
this.flpCars.AutoScrollMargin = new System.Drawing.Size(0, 200);
|
|
||||||
this.flpCars.Dock = System.Windows.Forms.DockStyle.Fill;
|
|
||||||
this.flpCars.Location = new System.Drawing.Point(3, 71);
|
|
||||||
this.flpCars.Name = "flpCars";
|
|
||||||
this.flpCars.Size = new System.Drawing.Size(796, 412);
|
|
||||||
this.flpCars.TabIndex = 1;
|
|
||||||
//
|
|
||||||
// tableLayoutPanel2
|
|
||||||
//
|
|
||||||
this.tableLayoutPanel2.ColumnCount = 2;
|
|
||||||
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
|
|
||||||
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
|
|
||||||
this.tableLayoutPanel2.Controls.Add(this.tbxSearch, 0, 0);
|
|
||||||
this.tableLayoutPanel2.Controls.Add(this.btnNewCar, 1, 0);
|
|
||||||
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
|
||||||
this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 31);
|
|
||||||
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
|
|
||||||
this.tableLayoutPanel2.RowCount = 1;
|
|
||||||
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
|
||||||
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 34F));
|
|
||||||
this.tableLayoutPanel2.Size = new System.Drawing.Size(796, 34);
|
|
||||||
this.tableLayoutPanel2.TabIndex = 2;
|
|
||||||
//
|
|
||||||
// tbxSearch
|
|
||||||
//
|
|
||||||
this.tbxSearch.Dock = System.Windows.Forms.DockStyle.Fill;
|
|
||||||
this.tbxSearch.Location = new System.Drawing.Point(3, 3);
|
|
||||||
this.tbxSearch.Name = "tbxSearch";
|
|
||||||
this.tbxSearch.Size = new System.Drawing.Size(392, 22);
|
|
||||||
this.tbxSearch.TabIndex = 3;
|
|
||||||
this.tbxSearch.TextChanged += new System.EventHandler(this.tbxSearch_TextChanged);
|
|
||||||
//
|
|
||||||
// btnNewCar
|
|
||||||
//
|
|
||||||
this.btnNewCar.Location = new System.Drawing.Point(401, 3);
|
|
||||||
this.btnNewCar.Name = "btnNewCar";
|
|
||||||
this.btnNewCar.Size = new System.Drawing.Size(75, 23);
|
|
||||||
this.btnNewCar.TabIndex = 4;
|
|
||||||
this.btnNewCar.Text = "Add Car";
|
|
||||||
this.btnNewCar.UseVisualStyleBackColor = true;
|
|
||||||
this.btnNewCar.Click += new System.EventHandler(this.btnNewCar_Click);
|
|
||||||
//
|
|
||||||
// menuStrip1
|
|
||||||
//
|
|
||||||
this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
|
|
||||||
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
|
||||||
this.fileToolStripMenuItem});
|
|
||||||
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
|
|
||||||
this.menuStrip1.Name = "menuStrip1";
|
|
||||||
this.menuStrip1.Size = new System.Drawing.Size(802, 28);
|
|
||||||
this.menuStrip1.TabIndex = 3;
|
|
||||||
this.menuStrip1.Text = "menuStrip1";
|
|
||||||
//
|
|
||||||
// fileToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
|
||||||
this.openToolStripMenuItem,
|
|
||||||
this.saveToolStripMenuItem,
|
|
||||||
this.saveAsToolStripMenuItem,
|
|
||||||
this.importToolStripMenuItem,
|
|
||||||
this.recentFilesToolStripMenuItem,
|
|
||||||
this.revealInFileExplorerToolStripMenuItem});
|
|
||||||
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
|
|
||||||
this.fileToolStripMenuItem.Size = new System.Drawing.Size(46, 24);
|
|
||||||
this.fileToolStripMenuItem.Text = "File";
|
|
||||||
//
|
|
||||||
// openToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.openToolStripMenuItem.Name = "openToolStripMenuItem";
|
|
||||||
this.openToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
|
||||||
this.openToolStripMenuItem.Text = "Open";
|
|
||||||
this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// saveToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.saveToolStripMenuItem.Name = "saveToolStripMenuItem";
|
|
||||||
this.saveToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
|
||||||
this.saveToolStripMenuItem.Text = "Save";
|
|
||||||
this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// saveAsToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem";
|
|
||||||
this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
|
||||||
this.saveAsToolStripMenuItem.Text = "Save as";
|
|
||||||
this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// importToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.importToolStripMenuItem.Name = "importToolStripMenuItem";
|
|
||||||
this.importToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
|
||||||
this.importToolStripMenuItem.Text = "Import";
|
|
||||||
this.importToolStripMenuItem.Click += new System.EventHandler(this.importToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// recentFilesToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.recentFilesToolStripMenuItem.Name = "recentFilesToolStripMenuItem";
|
|
||||||
this.recentFilesToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
|
||||||
this.recentFilesToolStripMenuItem.Text = "Recent Files";
|
|
||||||
this.recentFilesToolStripMenuItem.Click += new System.EventHandler(this.recentFilesToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// revealInFileExplorerToolStripMenuItem
|
|
||||||
//
|
|
||||||
this.revealInFileExplorerToolStripMenuItem.Name = "revealInFileExplorerToolStripMenuItem";
|
|
||||||
this.revealInFileExplorerToolStripMenuItem.Size = new System.Drawing.Size(238, 26);
|
|
||||||
this.revealInFileExplorerToolStripMenuItem.Text = "Reveal in File Explorer";
|
|
||||||
this.revealInFileExplorerToolStripMenuItem.Click += new System.EventHandler(this.revealInFileExplorerToolStripMenuItem_Click);
|
|
||||||
//
|
|
||||||
// MainForm
|
|
||||||
//
|
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
|
||||||
this.ClientSize = new System.Drawing.Size(802, 458);
|
|
||||||
this.Controls.Add(this.tableLayoutPanel1);
|
|
||||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
|
||||||
this.MainMenuStrip = this.menuStrip1;
|
|
||||||
this.MinimumSize = new System.Drawing.Size(818, 497);
|
|
||||||
this.Name = "MainForm";
|
|
||||||
this.Text = "Carmanager 3";
|
|
||||||
this.tableLayoutPanel1.ResumeLayout(false);
|
|
||||||
this.tableLayoutPanel1.PerformLayout();
|
|
||||||
this.tableLayoutPanel2.ResumeLayout(false);
|
|
||||||
this.tableLayoutPanel2.PerformLayout();
|
|
||||||
this.menuStrip1.ResumeLayout(false);
|
|
||||||
this.menuStrip1.PerformLayout();
|
|
||||||
this.ResumeLayout(false);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
|
|
||||||
private System.Windows.Forms.FlowLayoutPanel flpCars;
|
|
||||||
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
|
|
||||||
private System.Windows.Forms.TextBox tbxSearch;
|
|
||||||
private System.Windows.Forms.Button btnNewCar;
|
|
||||||
private System.Windows.Forms.MenuStrip menuStrip1;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem importToolStripMenuItem;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem recentFilesToolStripMenuItem;
|
|
||||||
private System.Windows.Forms.ToolStripMenuItem revealInFileExplorerToolStripMenuItem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -17,6 +17,7 @@ namespace CarManagerV3
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private static readonly string recentPathsFile = "recent_paths.txt";
|
private static readonly string recentPathsFile = "recent_paths.txt";
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a file at a specified path if it does not already exist.
|
/// Initializes a file at a specified path if it does not already exist.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -52,6 +53,7 @@ namespace CarManagerV3
|
|||||||
{
|
{
|
||||||
List<Car> cars = new List<Car>();
|
List<Car> cars = new List<Car>();
|
||||||
List<string> failedLines = new List<string>();
|
List<string> failedLines = new List<string>();
|
||||||
|
bool isLegacy = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (StreamReader reader = new StreamReader(@path))
|
using (StreamReader reader = new StreamReader(@path))
|
||||||
@@ -61,6 +63,19 @@ namespace CarManagerV3
|
|||||||
{
|
{
|
||||||
// Process the line
|
// Process the line
|
||||||
if (line == "") continue;
|
if (line == "") continue;
|
||||||
|
if (Car.isLegacyCsvString(line))
|
||||||
|
{
|
||||||
|
if (!StateManager.askForMigration())
|
||||||
|
{
|
||||||
|
MessageBox.Show("The file you are trying to open is in an old format that is no longer supported. Please select a different file.", "Unsupported Format", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
throw new LegacyException();
|
||||||
|
//Environment.Exit(0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
isLegacy = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
Car tmp = Car.FromCsvString(line);
|
Car tmp = Car.FromCsvString(line);
|
||||||
if (tmp == null)
|
if (tmp == null)
|
||||||
{
|
{
|
||||||
@@ -71,7 +86,12 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
reader.Close();
|
reader.Close();
|
||||||
}
|
}
|
||||||
} catch (Exception ex)
|
}
|
||||||
|
catch (LegacyException ex)
|
||||||
|
{
|
||||||
|
throw ex;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine($"Error reading cars from file: {ex.Message}");
|
Console.Error.WriteLine($"Error reading cars from file: {ex.Message}");
|
||||||
}
|
}
|
||||||
@@ -84,6 +104,12 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
MessageBox.Show($"Warning: {failedLines.Count} lines in the file could not be parsed and were skipped. Check the console for details.", "Parsing Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
MessageBox.Show($"Warning: {failedLines.Count} lines in the file could not be parsed and were skipped. Check the console for details.", "Parsing Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
}
|
}
|
||||||
|
cars = StateManager.normalizeOrders(cars);
|
||||||
|
cars = cars.OrderBy(c => c.Order).ToList();
|
||||||
|
if (isLegacy)
|
||||||
|
{
|
||||||
|
SafeManager.SaveCars(path, cars);
|
||||||
|
}
|
||||||
return cars;
|
return cars;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,7 +130,8 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
writer.Close();
|
writer.Close();
|
||||||
}
|
}
|
||||||
} catch (Exception ex)
|
}
|
||||||
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine($"Error saving cars to file: {ex.Message}");
|
Console.Error.WriteLine($"Error saving cars to file: {ex.Message}");
|
||||||
MessageBox.Show($"Error saving cars to file: {ex.Message}", "Save Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show($"Error saving cars to file: {ex.Message}", "Save Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
@@ -149,7 +176,8 @@ namespace CarManagerV3
|
|||||||
}
|
}
|
||||||
writer.Close();
|
writer.Close();
|
||||||
}
|
}
|
||||||
} catch (Exception ex)
|
}
|
||||||
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine($"Error managing recent paths: {ex.Message}");
|
Console.Error.WriteLine($"Error managing recent paths: {ex.Message}");
|
||||||
}
|
}
|
||||||
@@ -178,11 +206,33 @@ namespace CarManagerV3
|
|||||||
reader.Close();
|
reader.Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception ex)
|
}
|
||||||
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.Error.WriteLine($"Error reading recent paths: {ex.Message}");
|
Console.Error.WriteLine($"Error reading recent paths: {ex.Message}");
|
||||||
}
|
}
|
||||||
return paths;
|
return paths;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the folder of the most recently opened file, or the users documents folder if no recent files.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string getRecentFolder()
|
||||||
|
{
|
||||||
|
List<string> recentPaths = GetRecentPaths();
|
||||||
|
if (recentPaths.Count > 0)
|
||||||
|
{
|
||||||
|
string recentFile = recentPaths[0];
|
||||||
|
if (File.Exists(recentFile))
|
||||||
|
{
|
||||||
|
return Path.GetDirectoryName(recentFile);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
namespace CarManagerV3
|
namespace CarManagerV3
|
||||||
{
|
{
|
||||||
@@ -17,6 +18,10 @@ namespace CarManagerV3
|
|||||||
// TODO: If no recent file paths are found, prompt user to select a file path instead of using a hardcoded default in the program folder.
|
// TODO: If no recent file paths are found, prompt user to select a file path instead of using a hardcoded default in the program folder.
|
||||||
static string filePath = "cars.csv";
|
static string filePath = "cars.csv";
|
||||||
|
|
||||||
|
static bool hasConfirmedMigration = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a car by its identifier.
|
/// Gets a car by its identifier.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -24,7 +29,7 @@ namespace CarManagerV3
|
|||||||
/// <returns>
|
/// <returns>
|
||||||
/// A <see cref="Car"/> object if found; otherwise, null.
|
/// A <see cref="Car"/> object if found; otherwise, null.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public static Car GetCarById(int id)
|
public static Car GetCarById(string id)
|
||||||
{
|
{
|
||||||
cars = SafeManager.ReadCars(filePath);
|
cars = SafeManager.ReadCars(filePath);
|
||||||
return cars.FirstOrDefault(c => c.Id == id);
|
return cars.FirstOrDefault(c => c.Id == id);
|
||||||
@@ -96,8 +101,8 @@ namespace CarManagerV3
|
|||||||
public static Car CreateCar(string make, string model, int year, string color, int mileage, decimal price)
|
public static Car CreateCar(string make, string model, int year, string color, int mileage, decimal price)
|
||||||
{
|
{
|
||||||
cars = SafeManager.ReadCars(filePath);
|
cars = SafeManager.ReadCars(filePath);
|
||||||
int newId = cars.Count > 0 ? cars.Max(c => c.Id) + 1 : 1;
|
int newOrder = cars.Count > 0 ? cars.Max(c => c.Order) + 1 : 1;
|
||||||
Car newCar = new Car(newId, make, model, year, color, mileage, price);
|
Car newCar = new Car("", make, model, year, color, mileage, price, newOrder);
|
||||||
AddCar(newCar);
|
AddCar(newCar);
|
||||||
return newCar;
|
return newCar;
|
||||||
}
|
}
|
||||||
@@ -109,7 +114,32 @@ namespace CarManagerV3
|
|||||||
/// <param name="path">The path.</param>
|
/// <param name="path">The path.</param>
|
||||||
public static void setFilePath(string path)
|
public static void setFilePath(string path)
|
||||||
{
|
{
|
||||||
|
// Reset migration confirmation when changing file path, as the new file may also require migration.
|
||||||
|
hasConfirmedMigration = false;
|
||||||
filePath = path;
|
filePath = path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<Car> normalizeOrders(List<Car> cars)
|
||||||
|
{
|
||||||
|
// Normalize the Order field of all cars to be sequential starting from 1, while keeping the relative order the same.
|
||||||
|
var orderedCars = cars.OrderBy(c => c.Order).ToList();
|
||||||
|
for (int i = 0; i < orderedCars.Count; i++)
|
||||||
|
{
|
||||||
|
orderedCars[i].Order = i + 1;
|
||||||
|
}
|
||||||
|
return orderedCars;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool askForMigration()
|
||||||
|
{
|
||||||
|
if (hasConfirmedMigration)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
DialogResult result = MessageBox.Show("The file you are trying to open is in an older format. Do you want to attempt to migrate it to the new format? If you choose not to migrate, the file will not be opened.", "Migration Needed", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
|
||||||
|
hasConfirmedMigration = result == DialogResult.Yes;
|
||||||
|
return hasConfirmedMigration;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
using System.Reflection;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
|
|
||||||
// General Information about an assembly is controlled through the following
|
|
||||||
// set of attributes. Change these attribute values to modify the information
|
|
||||||
// associated with an assembly.
|
|
||||||
[assembly: AssemblyTitle("CarManagerV3")]
|
|
||||||
[assembly: AssemblyDescription("")]
|
|
||||||
[assembly: AssemblyConfiguration("")]
|
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("CarManagerV3")]
|
|
||||||
[assembly: AssemblyCopyright("Copyright © 2025")]
|
|
||||||
[assembly: AssemblyTrademark("")]
|
|
||||||
[assembly: AssemblyCulture("")]
|
|
||||||
|
|
||||||
// Setting ComVisible to false makes the types in this assembly not visible
|
|
||||||
// to COM components. If you need to access a type in this assembly from
|
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
|
||||||
[assembly: Guid("93ca258b-a645-41a8-a24f-59036abc173f")]
|
|
||||||
|
|
||||||
// Version information for an assembly consists of the following four values:
|
|
||||||
//
|
|
||||||
// Major Version
|
|
||||||
// Minor Version
|
|
||||||
// Build Number
|
|
||||||
// Revision
|
|
||||||
//
|
|
||||||
[assembly: AssemblyVersion("1.0.0.0")]
|
|
||||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
|
||||||
2
CarManagerV3/Properties/Resources.Designer.cs
generated
2
CarManagerV3/Properties/Resources.Designer.cs
generated
@@ -19,7 +19,7 @@ namespace CarManagerV3.Properties {
|
|||||||
// class via a tool like ResGen or Visual Studio.
|
// class via a tool like ResGen or Visual Studio.
|
||||||
// To add or remove a member, edit your .ResX file then rerun ResGen
|
// To add or remove a member, edit your .ResX file then rerun ResGen
|
||||||
// with the /str option, or rebuild your VS project.
|
// with the /str option, or rebuild your VS project.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources {
|
internal class Resources {
|
||||||
|
|||||||
118
CarManagerV3/Util/CUID.cs
Normal file
118
CarManagerV3/Util/CUID.cs
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
using System;
|
||||||
|
using System.Buffers.Binary;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Security.Cryptography;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace CarManagerV3.Util
|
||||||
|
{
|
||||||
|
internal class CUID
|
||||||
|
{
|
||||||
|
public const int DefaultLength = 6;
|
||||||
|
|
||||||
|
private static int _counter = RandomNumberGenerator.GetInt32(int.MaxValue);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Generate a random CUID (Collision-resistant Unique Identifier) of a specified length.
|
||||||
|
/// The CUID is designed to be unique across different machines and time, making it suitable for use as an identifier for cars in the application.
|
||||||
|
/// The length must be between 4 and 32 characters to ensure a good balance between uniqueness and readability.
|
||||||
|
/// The generated CUID consists of a combination of alphanumeric characters to ensure uniqueness and readability.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="length">The desired length of the generated CUID</param>
|
||||||
|
/// <param name="prefixWithC">Whether to prefix the CUID with 'c' for better readability and to avoid starting with a digit.</param>"
|
||||||
|
/// <returns></returns>
|
||||||
|
public static string NewCUID(int length = DefaultLength, bool prefixWithC = true)
|
||||||
|
{
|
||||||
|
// CUIDv2 specs allow between 4 and 32 chars.
|
||||||
|
if(length < 4 || length > 32) throw new ArgumentOutOfRangeException("length");
|
||||||
|
|
||||||
|
// We will produce enough encoded chars to satisfy 'length' after prefixing and truncation.
|
||||||
|
// Base64 encodes 3 bytes -> 4 chars. So bytesNeeded ≈ ceil(charsNeeded * 3/4).
|
||||||
|
int charsNeeded = prefixWithC ? (length - 1) : length;
|
||||||
|
int bytesNeeded = (int)Math.Ceiling(charsNeeded * 3.0 / 4.0);
|
||||||
|
|
||||||
|
Span<byte> material = stackalloc byte[32];
|
||||||
|
FillMaterial(material);
|
||||||
|
|
||||||
|
byte[] outputBytes = ExpandWithSha256(material, bytesNeeded);
|
||||||
|
|
||||||
|
string encoded = Base64UrlEncode(outputBytes);
|
||||||
|
|
||||||
|
if (encoded.Length < charsNeeded)
|
||||||
|
{
|
||||||
|
// Extremely unlikely unless length is huge; ensure we have enough by expanding more.
|
||||||
|
// (Kept as a guard; for typical lengths like 24-64, you're fine.)
|
||||||
|
outputBytes = ExpandWithSha256(material, bytesNeeded + 32);
|
||||||
|
encoded = Base64UrlEncode(outputBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
string body = encoded.Substring(0, charsNeeded);
|
||||||
|
return prefixWithC ? ("c" + body) : body;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private static void FillMaterial(Span<byte> dst32)
|
||||||
|
{
|
||||||
|
// Compose a payload with:
|
||||||
|
// - 16 bytes random
|
||||||
|
// - 8 bytes timestamp (UTC ticks)
|
||||||
|
// - 4 bytes counter
|
||||||
|
// - 4 bytes process/thread noise
|
||||||
|
Span<byte> payload = stackalloc byte[16 + 8 + 4 + 4];
|
||||||
|
|
||||||
|
RandomNumberGenerator.Fill(payload.Slice(0, 16));
|
||||||
|
|
||||||
|
long ticks = DateTime.UtcNow.Ticks;
|
||||||
|
BinaryPrimitives.WriteInt64LittleEndian(payload.Slice(16, 8), ticks);
|
||||||
|
|
||||||
|
int c = Interlocked.Increment(ref _counter);
|
||||||
|
BinaryPrimitives.WriteInt32LittleEndian(payload.Slice(24, 4), c);
|
||||||
|
|
||||||
|
// Some extra variability (not relied on for security)
|
||||||
|
int noise = Environment.ProcessId ^ Thread.CurrentThread.ManagedThreadId ^ (int)Stopwatch.GetTimestamp();
|
||||||
|
BinaryPrimitives.WriteInt32LittleEndian(payload.Slice(28, 4), noise);
|
||||||
|
|
||||||
|
// Hash to produce 32 bytes of uniformly distributed output
|
||||||
|
SHA256.HashData(payload, dst32);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] ExpandWithSha256(ReadOnlySpan<byte> seed32, int bytesNeeded)
|
||||||
|
{
|
||||||
|
if (bytesNeeded <= 0) return Array.Empty<byte>();
|
||||||
|
|
||||||
|
// If <= 32 bytes, we can just take from seed32 by hashing once more for separation.
|
||||||
|
// We'll use SHA256(seed || blockIndex) to generate blocks.
|
||||||
|
int blocks = (int)Math.Ceiling(bytesNeeded / 32.0);
|
||||||
|
byte[] result = new byte[blocks * 32];
|
||||||
|
|
||||||
|
Span<byte> input = stackalloc byte[32 + 4];
|
||||||
|
seed32.CopyTo(input.Slice(0, 32));
|
||||||
|
|
||||||
|
for (int i = 0; i < blocks; i++)
|
||||||
|
{
|
||||||
|
BinaryPrimitives.WriteInt32LittleEndian(input.Slice(32, 4), i);
|
||||||
|
Span<byte> block = result.AsSpan(i * 32, 32);
|
||||||
|
SHA256.HashData(input, block);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result.Length == bytesNeeded) return result;
|
||||||
|
|
||||||
|
byte[] trimmed = new byte[bytesNeeded];
|
||||||
|
Buffer.BlockCopy(result, 0, trimmed, 0, bytesNeeded);
|
||||||
|
return trimmed;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string Base64UrlEncode(byte[] bytes)
|
||||||
|
{
|
||||||
|
// Standard base64url without padding per RFC 4648 §5
|
||||||
|
string b64 = Convert.ToBase64String(bytes);
|
||||||
|
return b64.Replace('+', '-').Replace('/', '_').TrimEnd('=');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user