16 Commits
1.3 ... 1.4.3.1

Author SHA1 Message Date
fe92236978 chore: bump version 2026-03-11 22:10:32 +01:00
ff101bf569 hotfix: directory init fixes & installer file naming system 2026-03-11 22:08:15 +01:00
74fddcdb9d chore: bump to 1.4.3 2026-03-11 14:46:02 +01:00
3cc1631d5a Merge pull request 'feature/autocomplete' (#8) from feature/autocomplete into master
Reviewed-on: #8
2026-03-11 14:41:46 +01:00
0e8c9fc691 chore(autocomplete): documentation 2026-03-11 14:38:12 +01:00
a0de93f98c feat: autocompletions 2026-03-11 14:28:43 +01:00
da8ce47f8b bump: installer version 2026-03-10 17:17:50 +01:00
e8972ed2bb Merge pull request 'feat(autoupdate): detect install type' (#7) from feature/auto-update into master
Reviewed-on: #7
2026-03-10 17:15:04 +01:00
41b3725faa feat(autoupdate): detect install type 2026-03-10 17:13:42 +01:00
1366481931 Merge pull request 'feature/auto-update' (#6) from feature/auto-update into master
Reviewed-on: #6
2026-03-10 16:40:01 +01:00
56165cae46 Merge branch 'master' into feature/auto-update 2026-03-10 16:39:50 +01:00
86e6be2bd3 fix: autoupdater failing to fetch prerelease versions 2026-03-10 16:38:18 +01:00
f24d1321a8 feat(autoupdate): remove trailing zeros, show prerelease tag 2026-03-10 16:17:04 +01:00
8245955e9c Merge pull request 'feature/auto-update' (#5) from feature/auto-update into master
Reviewed-on: #5
2026-03-10 16:03:55 +01:00
a7aad1a5ef feat: autoupdater 2026-03-10 16:02:23 +01:00
f065f58f71 dev: updater 2026-03-10 15:04:27 +01:00
28 changed files with 8577 additions and 217 deletions

View File

@@ -21,6 +21,12 @@
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_058C8316BA034FF38880D3C8838A3F74"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_39292C9AEE694F0B982DDECDC0233E12" "MsmKey" = "8:_39292C9AEE694F0B982DDECDC0233E12"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
@@ -160,6 +166,26 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_058C8316BA034FF38880D3C8838A3F74"
{
"SourcePath" = "8:E:\\Development\\Scripts\\CM3Merge\\merged-cars.json"
"TargetName" = "8:car_data.json"
"Tag" = "8:"
"Folder" = "8:_91D306E0AE6B4CA09DB4A07129FBDD93"
"Condition" = "8:"
"Transitive" = "11:TRUE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_39292C9AEE694F0B982DDECDC0233E12" "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_39292C9AEE694F0B982DDECDC0233E12"
{ {
"SourcePath" = "8:D:\\Assets\\Car Manager\\Icon\\CarMgm_Icon.ico" "SourcePath" = "8:D:\\Assets\\Car Manager\\Icon\\CarMgm_Icon.ico"
@@ -332,15 +358,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Car Manager 3" "ProductName" = "8:Car Manager 3"
"ProductCode" = "8:{79688954-DAEC-4255-BF3C-8FD89EEC28AA}" "ProductCode" = "8:{019F61F2-9751-4419-A752-CB720325E3A7}"
"PackageCode" = "8:{6ED782FF-C62F-45E9-B6A8-756604C01717}" "PackageCode" = "8:{831DA8BC-D3ED-4690-AA5B-7974A8D73953}"
"UpgradeCode" = "8:{6FF57925-465E-4DB9-85DA-CE933191A3DD}" "UpgradeCode" = "8:{6FF57925-465E-4DB9-85DA-CE933191A3DD}"
"AspNetVersion" = "8:2.0.50727.0" "AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.3.0" "ProductVersion" = "8:1.4.3.1"
"Manufacturer" = "8:Jaro Digital" "Manufacturer" = "8:Jaro Digital"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"
@@ -413,10 +439,32 @@
"Name" = "8:[Manufacturer]" "Name" = "8:[Manufacturer]"
"Condition" = "8:" "Condition" = "8:"
"AlwaysCreate" = "11:FALSE" "AlwaysCreate" = "11:FALSE"
"DeleteAtUninstall" = "11:FALSE" "DeleteAtUninstall" = "11:TRUE"
"Transitive" = "11:FALSE" "Transitive" = "11:FALSE"
"Keys" "Keys"
{ {
"{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_022FD53D0D4C4621A160F70F2E4A81DE"
{
"Name" = "8:CarManager3"
"Condition" = "8:"
"AlwaysCreate" = "11:FALSE"
"DeleteAtUninstall" = "11:TRUE"
"Transitive" = "11:FALSE"
"Keys"
{
}
"Values"
{
"{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_22123BF42909409F8D665A142188737C"
{
"Name" = "8:InstallType"
"Condition" = "8:"
"Transitive" = "11:TRUE"
"ValueTypes" = "3:1"
"Value" = "8:MSI"
}
}
}
} }
"Values" "Values"
{ {

View File

@@ -19,6 +19,7 @@ Global
{93CA258B-A645-41A8-A24F-59036ABC173F}.Release|Any CPU.Build.0 = Release|Any CPU {93CA258B-A645-41A8-A24F-59036ABC173F}.Release|Any CPU.Build.0 = Release|Any CPU
{47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Debug|Any CPU.ActiveCfg = Debug {47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Debug|Any CPU.ActiveCfg = Debug
{47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Release|Any CPU.ActiveCfg = Release {47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Release|Any CPU.ActiveCfg = Release
{47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Release|Any CPU.Build.0 = Release
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@@ -13,6 +13,15 @@
<setting name="DataLocation" serializeAs="String"> <setting name="DataLocation" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="AllowPrerelease" serializeAs="String">
<value>False</value>
</setting>
<setting name="LastFetchedAutoCompletions" serializeAs="String">
<value>2026-01-01</value>
</setting>
<setting name="FetchAutoCompletionsInterval" serializeAs="String">
<value>24.00:00:00</value>
</setting>
</CarManagerV3.Properties.Settings> </CarManagerV3.Properties.Settings>
</userSettings> </userSettings>
</configuration> </configuration>

View File

@@ -15,19 +15,21 @@
<UpdateRequired>false</UpdateRequired> <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.4.3.1</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <!--<GenerateAssemblyInfo>false</GenerateAssemblyInfo>-->
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets> <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<ApplicationIcon>CarMgm_Icon.ico</ApplicationIcon> <ApplicationIcon>CarMgm_Icon.ico</ApplicationIcon>
<AssemblyTitle>Car Manager 3</AssemblyTitle> <AssemblyTitle>CarManager3</AssemblyTitle>
<Version>1.3</Version> <Product>CarManager3</Product>
<AssemblyVersion>1.3.0</AssemblyVersion> <Version>1.4.3.1</Version>
<FileVersion>1.3.0</FileVersion> <Authors>Jaro Digital</Authors>
<Product>Car Manager 3</Product> <Company>Jaro Digital</Company>
<Title>Car Manager 3</Title>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Forms\Components\CarCard.cs"> <Compile Update="Forms\Components\CarCard.cs">
@@ -39,6 +41,7 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
</Compile> </Compile>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup> </ItemGroup>

View File

@@ -0,0 +1,50 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CarManagerV3.Classes
{
internal class CarManufacturer
{
public string Name { get; set; }
public List<string> Models { get; set; }
public CarManufacturer(string name)
{
Name = name;
Models = new List<string>();
}
public void AddModel(string model)
{
Models.Add(model);
}
public override string ToString()
{
return $"{Name} - Models: {string.Join(", ", Models)}";
}
public List<string> GetModels()
{
return Models;
}
public void RemoveModel(string model)
{
Models.Remove(model);
}
public void ClearModels()
{
Models.Clear();
}
public string GetModelByQuery(string query)
{
return Models.FirstOrDefault(m => m.Equals(query, StringComparison.OrdinalIgnoreCase));
}
}
}

View File

@@ -64,7 +64,7 @@
tableLayoutPanel1.AutoSize = true; tableLayoutPanel1.AutoSize = true;
tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
tableLayoutPanel1.ColumnCount = 2; tableLayoutPanel1.ColumnCount = 2;
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 70F)); tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel1.Controls.Add(pbxCarImage, 0, 0); tableLayoutPanel1.Controls.Add(pbxCarImage, 0, 0);
tableLayoutPanel1.Controls.Add(label1, 0, 1); tableLayoutPanel1.Controls.Add(label1, 0, 1);
@@ -82,18 +82,18 @@
tableLayoutPanel1.Controls.Add(tableLayoutPanel2, 1, 3); tableLayoutPanel1.Controls.Add(tableLayoutPanel2, 1, 3);
tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 3, 26, 3); tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 30, 4);
tableLayoutPanel1.Name = "tableLayoutPanel1"; tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.RowCount = 8; tableLayoutPanel1.RowCount = 8;
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 188F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 251F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 28F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 37F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 38F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 51F));
tableLayoutPanel1.Size = new System.Drawing.Size(469, 422); tableLayoutPanel1.Size = new System.Drawing.Size(536, 563);
tableLayoutPanel1.TabIndex = 0; tableLayoutPanel1.TabIndex = 0;
// //
// pbxCarImage // pbxCarImage
@@ -101,9 +101,10 @@
tableLayoutPanel1.SetColumnSpan(pbxCarImage, 2); tableLayoutPanel1.SetColumnSpan(pbxCarImage, 2);
pbxCarImage.Dock = System.Windows.Forms.DockStyle.Fill; pbxCarImage.Dock = System.Windows.Forms.DockStyle.Fill;
pbxCarImage.Image = (System.Drawing.Image)resources.GetObject("pbxCarImage.Image"); pbxCarImage.Image = (System.Drawing.Image)resources.GetObject("pbxCarImage.Image");
pbxCarImage.Location = new System.Drawing.Point(3, 3); pbxCarImage.Location = new System.Drawing.Point(3, 4);
pbxCarImage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
pbxCarImage.Name = "pbxCarImage"; pbxCarImage.Name = "pbxCarImage";
pbxCarImage.Size = new System.Drawing.Size(463, 182); pbxCarImage.Size = new System.Drawing.Size(530, 243);
pbxCarImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; pbxCarImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
pbxCarImage.TabIndex = 0; pbxCarImage.TabIndex = 0;
pbxCarImage.TabStop = false; pbxCarImage.TabStop = false;
@@ -112,9 +113,9 @@
// //
label1.AutoSize = true; label1.AutoSize = true;
label1.Dock = System.Windows.Forms.DockStyle.Fill; label1.Dock = System.Windows.Forms.DockStyle.Fill;
label1.Location = new System.Drawing.Point(3, 188); label1.Location = new System.Drawing.Point(3, 251);
label1.Name = "label1"; label1.Name = "label1";
label1.Size = new System.Drawing.Size(64, 28); label1.Size = new System.Drawing.Size(74, 37);
label1.TabIndex = 1; label1.TabIndex = 1;
label1.Text = "Make:"; label1.Text = "Make:";
label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -122,9 +123,10 @@
// tbxMake // tbxMake
// //
tbxMake.Dock = System.Windows.Forms.DockStyle.Fill; tbxMake.Dock = System.Windows.Forms.DockStyle.Fill;
tbxMake.Location = new System.Drawing.Point(73, 191); tbxMake.Location = new System.Drawing.Point(83, 255);
tbxMake.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
tbxMake.Name = "tbxMake"; tbxMake.Name = "tbxMake";
tbxMake.Size = new System.Drawing.Size(393, 23); tbxMake.Size = new System.Drawing.Size(450, 27);
tbxMake.TabIndex = 1; tbxMake.TabIndex = 1;
tbxMake.TextChanged += tbxMake_TextChanged; tbxMake.TextChanged += tbxMake_TextChanged;
tbxMake.Leave += tbxMake_Leave; tbxMake.Leave += tbxMake_Leave;
@@ -133,9 +135,9 @@
// //
label2.AutoSize = true; label2.AutoSize = true;
label2.Dock = System.Windows.Forms.DockStyle.Fill; label2.Dock = System.Windows.Forms.DockStyle.Fill;
label2.Location = new System.Drawing.Point(3, 216); label2.Location = new System.Drawing.Point(3, 288);
label2.Name = "label2"; label2.Name = "label2";
label2.Size = new System.Drawing.Size(64, 28); label2.Size = new System.Drawing.Size(74, 37);
label2.TabIndex = 3; label2.TabIndex = 3;
label2.Text = "Model:"; label2.Text = "Model:";
label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -143,9 +145,10 @@
// tbxModel // tbxModel
// //
tbxModel.Dock = System.Windows.Forms.DockStyle.Fill; tbxModel.Dock = System.Windows.Forms.DockStyle.Fill;
tbxModel.Location = new System.Drawing.Point(73, 219); tbxModel.Location = new System.Drawing.Point(83, 292);
tbxModel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
tbxModel.Name = "tbxModel"; tbxModel.Name = "tbxModel";
tbxModel.Size = new System.Drawing.Size(393, 23); tbxModel.Size = new System.Drawing.Size(450, 27);
tbxModel.TabIndex = 2; tbxModel.TabIndex = 2;
tbxModel.TextChanged += tbxModel_TextChanged; tbxModel.TextChanged += tbxModel_TextChanged;
tbxModel.Leave += tbxModel_Leave; tbxModel.Leave += tbxModel_Leave;
@@ -154,9 +157,9 @@
// //
label3.AutoSize = true; label3.AutoSize = true;
label3.Dock = System.Windows.Forms.DockStyle.Fill; label3.Dock = System.Windows.Forms.DockStyle.Fill;
label3.Location = new System.Drawing.Point(3, 244); label3.Location = new System.Drawing.Point(3, 325);
label3.Name = "label3"; label3.Name = "label3";
label3.Size = new System.Drawing.Size(64, 28); label3.Size = new System.Drawing.Size(74, 37);
label3.TabIndex = 5; label3.TabIndex = 5;
label3.Text = "Year:"; label3.Text = "Year:";
label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -165,9 +168,9 @@
// //
label4.AutoSize = true; label4.AutoSize = true;
label4.Dock = System.Windows.Forms.DockStyle.Fill; label4.Dock = System.Windows.Forms.DockStyle.Fill;
label4.Location = new System.Drawing.Point(3, 272); label4.Location = new System.Drawing.Point(3, 362);
label4.Name = "label4"; label4.Name = "label4";
label4.Size = new System.Drawing.Size(64, 28); label4.Size = new System.Drawing.Size(74, 37);
label4.TabIndex = 6; label4.TabIndex = 6;
label4.Text = "Color:"; label4.Text = "Color:";
label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -176,9 +179,9 @@
// //
label5.AutoSize = true; label5.AutoSize = true;
label5.Dock = System.Windows.Forms.DockStyle.Fill; label5.Dock = System.Windows.Forms.DockStyle.Fill;
label5.Location = new System.Drawing.Point(3, 300); label5.Location = new System.Drawing.Point(3, 399);
label5.Name = "label5"; label5.Name = "label5";
label5.Size = new System.Drawing.Size(64, 28); label5.Size = new System.Drawing.Size(74, 37);
label5.TabIndex = 7; label5.TabIndex = 7;
label5.Text = "Mileage:"; label5.Text = "Mileage:";
label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -187,9 +190,9 @@
// //
label6.AutoSize = true; label6.AutoSize = true;
label6.Dock = System.Windows.Forms.DockStyle.Fill; label6.Dock = System.Windows.Forms.DockStyle.Fill;
label6.Location = new System.Drawing.Point(3, 328); label6.Location = new System.Drawing.Point(3, 436);
label6.Name = "label6"; label6.Name = "label6";
label6.Size = new System.Drawing.Size(64, 28); label6.Size = new System.Drawing.Size(74, 37);
label6.TabIndex = 8; label6.TabIndex = 8;
label6.Text = "Price:"; label6.Text = "Price:";
label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -202,17 +205,19 @@
flowLayoutPanel1.Controls.Add(lblID); flowLayoutPanel1.Controls.Add(lblID);
flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
flowLayoutPanel1.Location = new System.Drawing.Point(3, 359); flowLayoutPanel1.Location = new System.Drawing.Point(3, 477);
flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
flowLayoutPanel1.Name = "flowLayoutPanel1"; flowLayoutPanel1.Name = "flowLayoutPanel1";
flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(4); flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(5);
flowLayoutPanel1.Size = new System.Drawing.Size(463, 60); flowLayoutPanel1.Size = new System.Drawing.Size(530, 82);
flowLayoutPanel1.TabIndex = 9; flowLayoutPanel1.TabIndex = 9;
// //
// btnSave // btnSave
// //
btnSave.Location = new System.Drawing.Point(386, 7); btnSave.Location = new System.Drawing.Point(442, 9);
btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
btnSave.Name = "btnSave"; btnSave.Name = "btnSave";
btnSave.Size = new System.Drawing.Size(66, 22); btnSave.Size = new System.Drawing.Size(75, 29);
btnSave.TabIndex = 7; btnSave.TabIndex = 7;
btnSave.Text = "Save"; btnSave.Text = "Save";
btnSave.UseVisualStyleBackColor = true; btnSave.UseVisualStyleBackColor = true;
@@ -220,9 +225,10 @@
// //
// btnDelete // btnDelete
// //
btnDelete.Location = new System.Drawing.Point(314, 7); btnDelete.Location = new System.Drawing.Point(361, 9);
btnDelete.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
btnDelete.Name = "btnDelete"; btnDelete.Name = "btnDelete";
btnDelete.Size = new System.Drawing.Size(66, 22); btnDelete.Size = new System.Drawing.Size(75, 29);
btnDelete.TabIndex = 8; btnDelete.TabIndex = 8;
btnDelete.Text = "Delete"; btnDelete.Text = "Delete";
btnDelete.UseVisualStyleBackColor = true; btnDelete.UseVisualStyleBackColor = true;
@@ -231,28 +237,30 @@
// lblID // lblID
// //
lblID.AutoSize = true; lblID.AutoSize = true;
lblID.Location = new System.Drawing.Point(290, 4); lblID.Location = new System.Drawing.Point(331, 5);
lblID.Name = "lblID"; lblID.Name = "lblID";
lblID.Size = new System.Drawing.Size(18, 15); lblID.Size = new System.Drawing.Size(24, 20);
lblID.TabIndex = 2; lblID.TabIndex = 2;
lblID.Text = "ID"; lblID.Text = "ID";
// //
// tbxColor // tbxColor
// //
tbxColor.Dock = System.Windows.Forms.DockStyle.Fill; tbxColor.Dock = System.Windows.Forms.DockStyle.Fill;
tbxColor.Location = new System.Drawing.Point(73, 275); tbxColor.Location = new System.Drawing.Point(83, 366);
tbxColor.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
tbxColor.Name = "tbxColor"; tbxColor.Name = "tbxColor";
tbxColor.Size = new System.Drawing.Size(393, 23); tbxColor.Size = new System.Drawing.Size(450, 27);
tbxColor.TabIndex = 4; tbxColor.TabIndex = 4;
tbxColor.TextChanged += tbxColor_TextChanged; tbxColor.TextChanged += tbxColor_TextChanged;
tbxColor.Leave += tbxColor_Leave; tbxColor.Leave += tbxColor_Leave;
// //
// nudMileage // nudMileage
// //
nudMileage.Location = new System.Drawing.Point(73, 303); nudMileage.Location = new System.Drawing.Point(83, 403);
nudMileage.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
nudMileage.Maximum = new decimal(new int[] { 999999, 0, 0, 0 }); nudMileage.Maximum = new decimal(new int[] { 999999, 0, 0, 0 });
nudMileage.Name = "nudMileage"; nudMileage.Name = "nudMileage";
nudMileage.Size = new System.Drawing.Size(105, 23); nudMileage.Size = new System.Drawing.Size(120, 27);
nudMileage.TabIndex = 5; nudMileage.TabIndex = 5;
nudMileage.ThousandsSeparator = true; nudMileage.ThousandsSeparator = true;
nudMileage.ValueChanged += nudMileage_ValueChanged; nudMileage.ValueChanged += nudMileage_ValueChanged;
@@ -260,10 +268,11 @@
// nudPrice // nudPrice
// //
nudPrice.DecimalPlaces = 2; nudPrice.DecimalPlaces = 2;
nudPrice.Location = new System.Drawing.Point(73, 331); nudPrice.Location = new System.Drawing.Point(83, 440);
nudPrice.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
nudPrice.Maximum = new decimal(new int[] { 999999, 0, 0, 0 }); nudPrice.Maximum = new decimal(new int[] { 999999, 0, 0, 0 });
nudPrice.Name = "nudPrice"; nudPrice.Name = "nudPrice";
nudPrice.Size = new System.Drawing.Size(105, 23); nudPrice.Size = new System.Drawing.Size(120, 27);
nudPrice.TabIndex = 6; nudPrice.TabIndex = 6;
nudPrice.ThousandsSeparator = true; nudPrice.ThousandsSeparator = true;
nudPrice.ValueChanged += nudPrice_ValueChanged; nudPrice.ValueChanged += nudPrice_ValueChanged;
@@ -278,19 +287,21 @@
tableLayoutPanel2.Controls.Add(lblAge, 1, 0); tableLayoutPanel2.Controls.Add(lblAge, 1, 0);
tableLayoutPanel2.Controls.Add(tbxAge, 2, 0); tableLayoutPanel2.Controls.Add(tbxAge, 2, 0);
tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
tableLayoutPanel2.Location = new System.Drawing.Point(73, 247); tableLayoutPanel2.Location = new System.Drawing.Point(83, 329);
tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
tableLayoutPanel2.Name = "tableLayoutPanel2"; tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.RowCount = 1; 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.Percent, 100F));
tableLayoutPanel2.Size = new System.Drawing.Size(393, 22); tableLayoutPanel2.Size = new System.Drawing.Size(450, 29);
tableLayoutPanel2.TabIndex = 10; tableLayoutPanel2.TabIndex = 10;
// //
// nudYear // nudYear
// //
nudYear.Location = new System.Drawing.Point(3, 3); nudYear.Location = new System.Drawing.Point(3, 4);
nudYear.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
nudYear.Maximum = new decimal(new int[] { 3000, 0, 0, 0 }); nudYear.Maximum = new decimal(new int[] { 3000, 0, 0, 0 });
nudYear.Name = "nudYear"; nudYear.Name = "nudYear";
nudYear.Size = new System.Drawing.Size(105, 23); nudYear.Size = new System.Drawing.Size(120, 27);
nudYear.TabIndex = 3; nudYear.TabIndex = 3;
nudYear.ValueChanged += nudYear_ValueChanged; nudYear.ValueChanged += nudYear_ValueChanged;
// //
@@ -298,10 +309,10 @@
// //
lblAge.AutoSize = true; lblAge.AutoSize = true;
lblAge.Dock = System.Windows.Forms.DockStyle.Fill; lblAge.Dock = System.Windows.Forms.DockStyle.Fill;
lblAge.Location = new System.Drawing.Point(134, 0); lblAge.Location = new System.Drawing.Point(153, 0);
lblAge.Name = "lblAge"; lblAge.Name = "lblAge";
lblAge.RightToLeft = System.Windows.Forms.RightToLeft.No; lblAge.RightToLeft = System.Windows.Forms.RightToLeft.No;
lblAge.Size = new System.Drawing.Size(125, 22); lblAge.Size = new System.Drawing.Size(144, 29);
lblAge.TabIndex = 4; lblAge.TabIndex = 4;
lblAge.Text = "Age"; lblAge.Text = "Age";
lblAge.TextAlign = System.Drawing.ContentAlignment.MiddleRight; lblAge.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -310,19 +321,21 @@
// //
tbxAge.Dock = System.Windows.Forms.DockStyle.Fill; tbxAge.Dock = System.Windows.Forms.DockStyle.Fill;
tbxAge.Enabled = false; tbxAge.Enabled = false;
tbxAge.Location = new System.Drawing.Point(265, 3); tbxAge.Location = new System.Drawing.Point(303, 4);
tbxAge.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
tbxAge.Name = "tbxAge"; tbxAge.Name = "tbxAge";
tbxAge.ReadOnly = true; tbxAge.ReadOnly = true;
tbxAge.Size = new System.Drawing.Size(125, 23); tbxAge.Size = new System.Drawing.Size(144, 27);
tbxAge.TabIndex = 5; tbxAge.TabIndex = 5;
// //
// CarDetailsForm // CarDetailsForm
// //
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
ClientSize = new System.Drawing.Size(469, 422); ClientSize = new System.Drawing.Size(536, 563);
Controls.Add(tableLayoutPanel1); Controls.Add(tableLayoutPanel1);
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
MaximizeBox = false; MaximizeBox = false;
Name = "CarDetailsForm"; Name = "CarDetailsForm";
Text = "Details"; Text = "Details";

View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using CarManagerV3.Util;
namespace CarManagerV3 namespace CarManagerV3
{ {
@@ -29,6 +30,39 @@ namespace CarManagerV3
{ {
lblID.Text = $"ID: {car.Id}"; lblID.Text = $"ID: {car.Id}";
} }
SetAutoCompleteForMake();
SetAutoCompleteForModel();
SetAutoCompleteForColor();
}
private void SetAutoCompleteForMake()
{
var makes = CarCompletions.GetCarBrands();
var makeAutoComplete = new AutoCompleteStringCollection();
makeAutoComplete.AddRange(makes.ToArray());
tbxMake.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
tbxMake.AutoCompleteSource = AutoCompleteSource.CustomSource;
tbxMake.AutoCompleteCustomSource = makeAutoComplete;
}
private void SetAutoCompleteForModel()
{
var models = CarCompletions.GetCarModels(tbxMake.Text);
var modelAutoComplete = new AutoCompleteStringCollection();
modelAutoComplete.AddRange(models.ToArray());
tbxModel.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
tbxModel.AutoCompleteSource = AutoCompleteSource.CustomSource;
tbxModel.AutoCompleteCustomSource = modelAutoComplete;
}
private void SetAutoCompleteForColor()
{
var colors = CarCompletions.CommonColors;
var colorAutoComplete = new AutoCompleteStringCollection();
colorAutoComplete.AddRange(colors.ToArray());
tbxColor.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
tbxColor.AutoCompleteSource = AutoCompleteSource.CustomSource;
tbxColor.AutoCompleteCustomSource = colorAutoComplete;
} }
/// <summary> /// <summary>
@@ -69,6 +103,7 @@ namespace CarManagerV3
() => car.Make = ValueOrFormer(tbxMake.Text, car.Make), () => car.Make = ValueOrFormer(tbxMake.Text, car.Make),
() => tbxMake.Text = car.Make () => tbxMake.Text = car.Make
); );
SetAutoCompleteForModel();
} }
private void tbxModel_TextChanged(object sender, EventArgs e) private void tbxModel_TextChanged(object sender, EventArgs e)
@@ -163,7 +198,8 @@ namespace CarManagerV3
protected override bool ProcessCmdKey(ref Message msg, Keys keyData) protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{ {
if (keyData == Keys.Enter) // Ctrl+S to save, Esc to close, Delete to delete
if (keyData == (Keys.Control | Keys.S))
{ {
btnSave.PerformClick(); btnSave.PerformClick();
return true; // Indicate that the key has been handled return true; // Indicate that the key has been handled

View File

@@ -0,0 +1,180 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace CarManagerV3
{
public class AnimatedProgressBar : UserControl
{
private Timer animationTimer;
private float animationPosition = 0f;
private Color primaryColor = Color.FromArgb(0, 120, 215);
private Color secondaryColor = Color.FromArgb(100, 180, 255);
private Color backgroundColor = Color.FromArgb(240, 240, 240);
public AnimatedProgressBar()
{
this.SetStyle(
ControlStyles.AllPaintingInWmPaint |
ControlStyles.UserPaint |
ControlStyles.OptimizedDoubleBuffer |
ControlStyles.ResizeRedraw,
true);
this.Height = 8;
// Initialize animation timer
animationTimer = new Timer();
animationTimer.Interval = 20; // 50 FPS
animationTimer.Tick += AnimationTimer_Tick;
animationTimer.Start();
}
private void AnimationTimer_Tick(object sender, EventArgs e)
{
animationPosition += 2f;
if (animationPosition > this.Width + 100)
{
animationPosition = -100;
}
this.Invalidate();
}
protected override void OnPaint(PaintEventArgs e)
{
base.OnPaint(e);
Graphics g = e.Graphics;
g.SmoothingMode = SmoothingMode.AntiAlias;
g.PixelOffsetMode = PixelOffsetMode.HighQuality;
// Draw background with rounded corners
using (GraphicsPath path = GetRoundedRect(ClientRectangle, 4))
{
using (SolidBrush bgBrush = new SolidBrush(backgroundColor))
{
g.FillPath(bgBrush, path);
}
}
// Create animated gradient bar
float barWidth = 100f;
RectangleF barRect = new RectangleF(animationPosition, 0, barWidth, this.Height);
if (barRect.Right > 0 && barRect.Left < this.Width)
{
using (GraphicsPath barPath = GetRoundedRect(barRect, 4))
{
// Create gradient brush
using (LinearGradientBrush gradientBrush = new LinearGradientBrush(
barRect,
Color.Transparent,
Color.Transparent,
LinearGradientMode.Horizontal))
{
ColorBlend colorBlend = new ColorBlend();
colorBlend.Colors = new Color[] {
Color.FromArgb(0, primaryColor),
primaryColor,
secondaryColor,
primaryColor,
Color.FromArgb(0, primaryColor)
};
colorBlend.Positions = new float[] { 0f, 0.2f, 0.5f, 0.8f, 1f };
gradientBrush.InterpolationColors = colorBlend;
// Clip to control bounds
Region oldClip = g.Clip;
using (GraphicsPath clipPath = GetRoundedRect(ClientRectangle, 4))
{
g.SetClip(clipPath);
g.FillPath(gradientBrush, barPath);
g.Clip = oldClip;
}
}
}
}
// Draw subtle border
using (GraphicsPath borderPath = GetRoundedRect(ClientRectangle, 4))
{
using (Pen borderPen = new Pen(Color.FromArgb(220, 220, 220), 1))
{
g.DrawPath(borderPen, borderPath);
}
}
}
private GraphicsPath GetRoundedRect(RectangleF rect, float radius)
{
GraphicsPath path = new GraphicsPath();
float diameter = radius * 2;
path.AddArc(rect.X, rect.Y, diameter, diameter, 180, 90);
path.AddArc(rect.Right - diameter, rect.Y, diameter, diameter, 270, 90);
path.AddArc(rect.Right - diameter, rect.Bottom - diameter, diameter, diameter, 0, 90);
path.AddArc(rect.X, rect.Bottom - diameter, diameter, diameter, 90, 90);
path.CloseFigure();
return path;
}
public void StartAnimation()
{
animationTimer.Start();
}
public void StopAnimation()
{
animationTimer.Stop();
}
//protected override void Dispose(bool disposing)
//{
// if (disposing)
// {
// animationTimer?.Stop();
// animationTimer?.Dispose();
// }
// base.Dispose(disposing);
//}
// Properties for customization
public Color PrimaryColor
{
get => primaryColor;
set
{
primaryColor = value;
this.Invalidate();
}
}
public Color SecondaryColor
{
get => secondaryColor;
set
{
secondaryColor = value;
this.Invalidate();
}
}
public Color ProgressBackColor
{
get => backgroundColor;
set
{
backgroundColor = value;
this.Invalidate();
}
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -49,11 +49,14 @@
addCarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); addCarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); importToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
clearSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); clearSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
openWelcomeScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); openWelcomeScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
clearRecentFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); clearRecentFilesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
imageList1 = new System.Windows.Forms.ImageList(components); imageList1 = new System.Windows.Forms.ImageList(components);
settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
checkForUpdatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
gitRepositoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
tableLayoutPanel1.SuspendLayout(); tableLayoutPanel1.SuspendLayout();
tlpControls.SuspendLayout(); tlpControls.SuspendLayout();
tlpSearch.SuspendLayout(); tlpSearch.SuspendLayout();
@@ -171,7 +174,7 @@
// //
menuStrip1.BackColor = System.Drawing.SystemColors.ButtonFace; menuStrip1.BackColor = System.Drawing.SystemColors.ButtonFace;
menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem, editToolStripMenuItem, toolsToolStripMenuItem }); menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem, editToolStripMenuItem, toolsToolStripMenuItem, aboutToolStripMenuItem });
menuStrip1.Location = new System.Drawing.Point(0, 0); menuStrip1.Location = new System.Drawing.Point(0, 0);
menuStrip1.Name = "menuStrip1"; menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new System.Drawing.Size(902, 28); menuStrip1.Size = new System.Drawing.Size(902, 28);
@@ -240,24 +243,31 @@
// addCarToolStripMenuItem // addCarToolStripMenuItem
// //
addCarToolStripMenuItem.Name = "addCarToolStripMenuItem"; addCarToolStripMenuItem.Name = "addCarToolStripMenuItem";
addCarToolStripMenuItem.Size = new System.Drawing.Size(224, 26); addCarToolStripMenuItem.Size = new System.Drawing.Size(174, 26);
addCarToolStripMenuItem.Text = "Add Car"; addCarToolStripMenuItem.Text = "Add Car";
addCarToolStripMenuItem.Click += addCarToolStripMenuItem_Click; addCarToolStripMenuItem.Click += addCarToolStripMenuItem_Click;
// //
// importToolStripMenuItem // importToolStripMenuItem
// //
importToolStripMenuItem.Name = "importToolStripMenuItem"; importToolStripMenuItem.Name = "importToolStripMenuItem";
importToolStripMenuItem.Size = new System.Drawing.Size(224, 26); importToolStripMenuItem.Size = new System.Drawing.Size(174, 26);
importToolStripMenuItem.Text = "Import"; importToolStripMenuItem.Text = "Import";
importToolStripMenuItem.Click += importToolStripMenuItem_Click; importToolStripMenuItem.Click += importToolStripMenuItem_Click;
// //
// clearSearchToolStripMenuItem // clearSearchToolStripMenuItem
// //
clearSearchToolStripMenuItem.Name = "clearSearchToolStripMenuItem"; clearSearchToolStripMenuItem.Name = "clearSearchToolStripMenuItem";
clearSearchToolStripMenuItem.Size = new System.Drawing.Size(224, 26); clearSearchToolStripMenuItem.Size = new System.Drawing.Size(174, 26);
clearSearchToolStripMenuItem.Text = "Clear Search"; clearSearchToolStripMenuItem.Text = "Clear Search";
clearSearchToolStripMenuItem.Click += clearSearchToolStripMenuItem_Click; clearSearchToolStripMenuItem.Click += clearSearchToolStripMenuItem_Click;
// //
// settingsToolStripMenuItem
//
settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
settingsToolStripMenuItem.Size = new System.Drawing.Size(174, 26);
settingsToolStripMenuItem.Text = "Settings";
settingsToolStripMenuItem.Click += settingsToolStripMenuItem_Click;
//
// toolsToolStripMenuItem // toolsToolStripMenuItem
// //
toolsToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; toolsToolStripMenuItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
@@ -290,12 +300,26 @@
imageList1.Images.SetKeyName(0, "Icon_Search.png"); imageList1.Images.SetKeyName(0, "Icon_Search.png");
imageList1.Images.SetKeyName(1, "Icon_Add.png"); imageList1.Images.SetKeyName(1, "Icon_Add.png");
// //
// settingsToolStripMenuItem // aboutToolStripMenuItem
// //
settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; aboutToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { checkForUpdatesToolStripMenuItem, gitRepositoryToolStripMenuItem });
settingsToolStripMenuItem.Size = new System.Drawing.Size(224, 26); aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
settingsToolStripMenuItem.Text = "Settings"; aboutToolStripMenuItem.Size = new System.Drawing.Size(64, 24);
settingsToolStripMenuItem.Click += settingsToolStripMenuItem_Click; aboutToolStripMenuItem.Text = "About";
//
// checkForUpdatesToolStripMenuItem
//
checkForUpdatesToolStripMenuItem.Name = "checkForUpdatesToolStripMenuItem";
checkForUpdatesToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
checkForUpdatesToolStripMenuItem.Text = "Check for Updates";
checkForUpdatesToolStripMenuItem.Click += checkForUpdatesToolStripMenuItem_Click;
//
// gitRepositoryToolStripMenuItem
//
gitRepositoryToolStripMenuItem.Name = "gitRepositoryToolStripMenuItem";
gitRepositoryToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
gitRepositoryToolStripMenuItem.Text = "Git Repository";
gitRepositoryToolStripMenuItem.Click += gitRepositoryToolStripMenuItem_Click;
// //
// MainForm // MainForm
// //
@@ -348,5 +372,8 @@
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem clearRecentFilesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem clearRecentFilesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem checkForUpdatesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem gitRepositoryToolStripMenuItem;
} }
} }

View File

@@ -5,6 +5,8 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using CarManagerV3.Forms; using CarManagerV3.Forms;
using CarManagerV3.Manager;
using CarManagerV3.Util;
namespace CarManagerV3 namespace CarManagerV3
{ {
@@ -60,6 +62,32 @@ namespace CarManagerV3
} }
refreshRecents(); refreshRecents();
try
{
if (Updater.IsUpdateAvailable(Properties.Settings.Default.AllowPrerelease))
{
if (InstallModeDetector.IsInstalledViaMsi())
{
UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(true), Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
updatePrompt.ShowDialog();
} else
{
DialogResult updateResult = MessageBox.Show($"A new version of Car Manager is available! \nYour Version: {Updater.GetCurrentVersion(true)} \nLatest Version: {Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease)} \n\nDo you want to open the Git repository to download the update?", "Update Available", MessageBoxButtons.YesNo, MessageBoxIcon.Information);
if (updateResult == DialogResult.Yes)
{
Updater.OpenReleasePage(Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
}
}
}
}
catch (Exception ex)
{
Console.Error.WriteLine("Error checking for updates: " + ex.Message);
}
CarCompletions.UpdateCarCompletionDataAsync();
} }
@@ -142,7 +170,7 @@ namespace CarManagerV3
Console.WriteLine($"[L] Updating car: {car.Id}"); Console.WriteLine($"[L] Updating car: {car.Id}");
// changes // changes
card = existing; card = existing;
if(force) card.LoadImage(); // reload image if forced refresh if (force) card.LoadImage(); // reload image if forced refresh
} }
else else
{ {
@@ -190,7 +218,7 @@ namespace CarManagerV3
Car other = cars.Where(c => c.Order < order).OrderByDescending(c => c.Order).FirstOrDefault(); Car other = cars.Where(c => c.Order < order).OrderByDescending(c => c.Order).FirstOrDefault();
if (other != null) if (other != null)
{ {
Console.WriteLine($"Swapping order of {car.ToString()} ({car.Order}) and {other.ToString()} ({other.Order})"); System.Diagnostics.Debug.WriteLine($"Swapping order of {car.ToString()} ({car.Order}) and {other.ToString()} ({other.Order})");
int temp = car.Order; int temp = car.Order;
car.Order = other.Order; car.Order = other.Order;
other.Order = temp; other.Order = temp;
@@ -207,7 +235,7 @@ namespace CarManagerV3
Car other = cars.Where(c => c.Order > order).OrderBy(c => c.Order).FirstOrDefault(); Car other = cars.Where(c => c.Order > order).OrderBy(c => c.Order).FirstOrDefault();
if (other != null) if (other != null)
{ {
Console.WriteLine($"Swapping order of {car.ToString()} ({car.Order}) and {other.ToString()} ({other.Order})"); System.Diagnostics.Debug.WriteLine($"Swapping order of {car.ToString()} ({car.Order}) and {other.ToString()} ({other.Order})");
int temp = car.Order; int temp = car.Order;
car.Order = other.Order; car.Order = other.Order;
other.Order = temp; other.Order = temp;
@@ -550,5 +578,35 @@ namespace CarManagerV3
settingsForm.ShowDialog(); settingsForm.ShowDialog();
} }
private void checkForUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
if (Updater.IsUpdateAvailable(Properties.Settings.Default.AllowPrerelease))
{
UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(true), Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
updatePrompt.ShowDialog();
}
else
{
MessageBox.Show($"You are already using the latest version. \nYour Version: {Updater.GetCurrentVersion(true)} \nLatest Version: {Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease)}", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
catch (Exception ex)
{
MessageBox.Show("Error checking for updates: " + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void gitRepositoryToolStripMenuItem_Click(object sender, EventArgs e)
{
// Open the Git repository in the user's default browser
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
{
FileName = "https://git.jaro.digital/frozd/carmanager-3",
UseShellExecute = true
});
}
} }
} }

View File

@@ -117,6 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnNewCar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnNewCar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@@ -139,9 +142,6 @@
VXs21p8MAVc2KdQAvwAAAABJRU5ErkJggg== VXs21p8MAVc2KdQAvwAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>153, 17</value> <value>153, 17</value>
</metadata> </metadata>
@@ -150,15 +150,15 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAYAQAAAJNU0Z0AUkBTAIBAQIB SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAYAQAAAJNU0Z0AUkBTAIBAQIB
AAGIAQABiAEAARQBAAEUAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABUAMAARQDAAEBAQABIAYAARn/ AAGYAQABmAEAARQBAAEUAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABUAMAARQDAAEBAQABIAYAARn/
AP8AzAADCAEKAyMBMgMuAUYDFgEe/wAtAAMIAQoDIwEyAk8BTgGXAlYBVAGrAy4BRv8ALQADIwEyAk8B AP8AzAADCAEKAyMBMgMuAUYDFgEe/wAtAAMIAQoDIwEyAk8BTgGXAlYBVAGrAy4BRv8ALQADIwEyAk8B
TgGXAf8BmQEzAf8DTgGWAyMBMiwAA10BzAT/9AADKAE8Ak8BTgGXAl8BWwHTA04BlgMjATIDCAEKLAAD TgGXAf8BmQEzAf8DTgGWAyMBMiwAA10BzAT/9AADKAE8Ak8BTgGXAl8BWwHTA04BlgMjATIDCAEKLAAD
XQHMBP/UAAMDAQQDDwETA0QBewJPAU4BlwNNAZIDQAFuAwYBBwMpAT0DTgGYAlsBWQHAAk8BTgGXAyMB XQHMBP/UAAMDAQQDDwETA0QBewJPAU4BlwNNAZIDQAFuAwYBBwMpAT0DTgGYAlsBWQHAAk8BTgGXAyMB
MgMIAQowAANdAcwE/9AAAxMBGgMxAU0DRAF5AlwBWQHBAmEBXQHPAl0BWwHKAlcBVQG0Az8BbQNSAaMC MgMIAQowAANdAcwE/9AAAxMBGgMxAU0DRAF5AlwBWQHBAmEBXQHPAl0BWwHKAlcBVQG0Az8BbQNSAaMC
WwFZAcADTgGYAygBPDgAA10BzAT/zAADAwEEAzEBTQJZAVcBvAJgAV0BzgNLAYwDQAFvA0ABbwNLAYwC WwFZAcADTgGYAygBPDgAA10BzAT/zAADAwEEAzEBTQJZAVcBvAJgAV0BzgNLAYwDQAFvA0ABbwNLAYwC
YAFdAc4BggFxAVMB9AJTAVEBogMpAT08AANdAcwE/8wAAw8BEwNEAXkCYAFdAc4DBgEIBAIIAAQCAwYB YAFdAc4BfAFtAVMB9AJTAVEBogMpAT08AANdAcwE/8wAAw8BEwNEAXkCYAFdAc4DBgEIBAIIAAQCAwYB
CAJgAV0BzgM+AWsDBAEFKAADXQHMLP+4AANEAXkDWgG/A0sBjAQCEAAEAgNLAYwCWgFYAbcDQQFxKAAD CAJgAV0BzgM+AWsDBAEFKAADXQHMLP+4AANEAXkDWgG/A0sBjAQCEAAEAgNLAYwCWgFYAbcDQQFxKAAD
UgGjA10BzANdAcwDXQHMA10BzAOJAfUE/wNdAcwDXQHMA10BzANdAcwDXQHMuAACTwFOAZcCYAFdAc4D UgGjA10BzANdAcwDXQHMA10BzAOFAfUE/wNdAcwDXQHMA10BzANdAcwDXQHMuAACTwFOAZcCYAFdAc4D
QAFvGAADQAFvAl8BXAHLA04BlDwAA10BzAT/zAACTwFOAZcCYAFdAc4DQAFvGAADQAFvAl4BWwHNA04B QAFvGAADQAFvAl8BXAHLA04BlDwAA10BzAT/zAACTwFOAZcCYAFdAc4DQAFvGAADQAFvAl4BWwHNA04B
ljwAA10BzAT/zAADRAF6AlsBWQHAA0sBjAQCEAAEAgNLAYwCWgFYAb0CRAFDAXc8AANdAcwE/8wAAw4B ljwAA10BzAT/zAADRAF6AlsBWQHAA0sBjAQCEAAEAgNLAYwCWgFYAb0CRAFDAXc8AANdAcwE/8wAAw4B
EgNEAXgCYAFdAc4DBgEIBAIIAAQCAwYBCAJgAV0BzgJDAUIBdQMMAQ88AANdAcwE/8wAAwMBBAMxAU0C EgNEAXgCYAFdAc4DBgEIBAIIAAQCAwYBCAJgAV0BzgJDAUIBdQMMAQ88AANdAcwE/8wAAwMBBAMxAU0C

View File

@@ -36,14 +36,27 @@
btnAccept = new System.Windows.Forms.Button(); btnAccept = new System.Windows.Forms.Button();
btnDiscard = new System.Windows.Forms.Button(); btnDiscard = new System.Windows.Forms.Button();
tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
lblCompletionsRefreshWindow = new System.Windows.Forms.Label();
lblDataLocation = new System.Windows.Forms.Label(); lblDataLocation = new System.Windows.Forms.Label();
tbxDataLocation = new System.Windows.Forms.TextBox(); tbxDataLocation = new System.Windows.Forms.TextBox();
cbxPreRelease = new System.Windows.Forms.CheckBox();
flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel();
nudCompletionIntervalHours = new System.Windows.Forms.NumericUpDown();
label3 = new System.Windows.Forms.Label();
nudCompletionIntervalMinutes = new System.Windows.Forms.NumericUpDown();
label4 = new System.Windows.Forms.Label();
tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
btnReset = new System.Windows.Forms.Button(); btnReset = new System.Windows.Forms.Button();
flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
lblEnv = new System.Windows.Forms.Label();
flowLayoutPanel1.SuspendLayout(); flowLayoutPanel1.SuspendLayout();
flowLayoutPanel2.SuspendLayout(); flowLayoutPanel2.SuspendLayout();
tableLayoutPanel1.SuspendLayout(); tableLayoutPanel1.SuspendLayout();
flowLayoutPanel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)nudCompletionIntervalHours).BeginInit();
((System.ComponentModel.ISupportInitialize)nudCompletionIntervalMinutes).BeginInit();
tableLayoutPanel2.SuspendLayout(); tableLayoutPanel2.SuspendLayout();
flowLayoutPanel3.SuspendLayout();
SuspendLayout(); SuspendLayout();
// //
// flowLayoutPanel1 // flowLayoutPanel1
@@ -83,10 +96,10 @@
flowLayoutPanel2.Controls.Add(btnDiscard); flowLayoutPanel2.Controls.Add(btnDiscard);
flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
flowLayoutPanel2.Location = new System.Drawing.Point(249, 0); flowLayoutPanel2.Location = new System.Drawing.Point(249, 30);
flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
flowLayoutPanel2.Name = "flowLayoutPanel2"; flowLayoutPanel2.Name = "flowLayoutPanel2";
flowLayoutPanel2.Size = new System.Drawing.Size(240, 64); flowLayoutPanel2.Size = new System.Drawing.Size(240, 44);
flowLayoutPanel2.TabIndex = 2; flowLayoutPanel2.TabIndex = 2;
// //
// btnAccept // btnAccept
@@ -117,25 +130,46 @@
tableLayoutPanel1.ColumnCount = 2; tableLayoutPanel1.ColumnCount = 2;
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel1.Controls.Add(lblCompletionsRefreshWindow, 0, 2);
tableLayoutPanel1.Controls.Add(lblDataLocation, 0, 0); tableLayoutPanel1.Controls.Add(lblDataLocation, 0, 0);
tableLayoutPanel1.Controls.Add(tbxDataLocation, 1, 0); tableLayoutPanel1.Controls.Add(tbxDataLocation, 1, 0);
tableLayoutPanel1.Controls.Add(cbxPreRelease, 0, 1);
tableLayoutPanel1.Controls.Add(flowLayoutPanel4, 1, 2);
tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
tableLayoutPanel1.Location = new System.Drawing.Point(0, 86); tableLayoutPanel1.Location = new System.Drawing.Point(0, 86);
tableLayoutPanel1.Name = "tableLayoutPanel1"; tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
tableLayoutPanel1.RowCount = 2; tableLayoutPanel1.RowCount = 7;
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 0F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
tableLayoutPanel1.Size = new System.Drawing.Size(499, 531); tableLayoutPanel1.Size = new System.Drawing.Size(499, 531);
tableLayoutPanel1.TabIndex = 3; tableLayoutPanel1.TabIndex = 3;
// //
// lblCompletionsRefreshWindow
//
lblCompletionsRefreshWindow.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
lblCompletionsRefreshWindow.AutoSize = true;
lblCompletionsRefreshWindow.Location = new System.Drawing.Point(13, 66);
lblCompletionsRefreshWindow.Margin = new System.Windows.Forms.Padding(3);
lblCompletionsRefreshWindow.MaximumSize = new System.Drawing.Size(150, 0);
lblCompletionsRefreshWindow.Name = "lblCompletionsRefreshWindow";
lblCompletionsRefreshWindow.Size = new System.Drawing.Size(148, 1);
lblCompletionsRefreshWindow.TabIndex = 4;
lblCompletionsRefreshWindow.Text = "Refresh completions after";
lblCompletionsRefreshWindow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblDataLocation // lblDataLocation
// //
lblDataLocation.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; lblDataLocation.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
lblDataLocation.AutoSize = true; lblDataLocation.AutoSize = true;
lblDataLocation.Location = new System.Drawing.Point(13, 6); lblDataLocation.Location = new System.Drawing.Point(13, 6);
lblDataLocation.Name = "lblDataLocation"; lblDataLocation.Name = "lblDataLocation";
lblDataLocation.Size = new System.Drawing.Size(102, 20); lblDataLocation.Size = new System.Drawing.Size(148, 20);
lblDataLocation.TabIndex = 0; lblDataLocation.TabIndex = 0;
lblDataLocation.Text = "Data Location"; lblDataLocation.Text = "Data Location";
lblDataLocation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; lblDataLocation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -143,31 +177,101 @@
// tbxDataLocation // tbxDataLocation
// //
tbxDataLocation.Dock = System.Windows.Forms.DockStyle.Fill; tbxDataLocation.Dock = System.Windows.Forms.DockStyle.Fill;
tbxDataLocation.Location = new System.Drawing.Point(121, 3); tbxDataLocation.Location = new System.Drawing.Point(167, 3);
tbxDataLocation.Name = "tbxDataLocation"; tbxDataLocation.Name = "tbxDataLocation";
tbxDataLocation.Size = new System.Drawing.Size(365, 27); tbxDataLocation.Size = new System.Drawing.Size(319, 27);
tbxDataLocation.TabIndex = 1; tbxDataLocation.TabIndex = 1;
// //
// cbxPreRelease
//
cbxPreRelease.AutoSize = true;
tableLayoutPanel1.SetColumnSpan(cbxPreRelease, 2);
cbxPreRelease.Location = new System.Drawing.Point(13, 36);
cbxPreRelease.Name = "cbxPreRelease";
cbxPreRelease.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
cbxPreRelease.Size = new System.Drawing.Size(164, 24);
cbxPreRelease.TabIndex = 3;
cbxPreRelease.Text = "Pre-Release channel";
cbxPreRelease.UseVisualStyleBackColor = true;
//
// flowLayoutPanel4
//
flowLayoutPanel4.AutoSize = true;
flowLayoutPanel4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
flowLayoutPanel4.Controls.Add(nudCompletionIntervalHours);
flowLayoutPanel4.Controls.Add(label3);
flowLayoutPanel4.Controls.Add(nudCompletionIntervalMinutes);
flowLayoutPanel4.Controls.Add(label4);
flowLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
flowLayoutPanel4.Location = new System.Drawing.Point(164, 66);
flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
flowLayoutPanel4.Name = "flowLayoutPanel4";
flowLayoutPanel4.Size = new System.Drawing.Size(325, 1);
flowLayoutPanel4.TabIndex = 5;
//
// nudCompletionIntervalHours
//
nudCompletionIntervalHours.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
nudCompletionIntervalHours.Location = new System.Drawing.Point(3, 3);
nudCompletionIntervalHours.Name = "nudCompletionIntervalHours";
nudCompletionIntervalHours.Size = new System.Drawing.Size(44, 27);
nudCompletionIntervalHours.TabIndex = 0;
nudCompletionIntervalHours.UpDownAlign = System.Windows.Forms.LeftRightAlignment.Left;
//
// label3
//
label3.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom;
label3.AutoSize = true;
label3.Location = new System.Drawing.Point(53, 0);
label3.Name = "label3";
label3.Size = new System.Drawing.Size(24, 33);
label3.TabIndex = 1;
label3.Text = "h :";
label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// nudCompletionIntervalMinutes
//
nudCompletionIntervalMinutes.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
nudCompletionIntervalMinutes.Location = new System.Drawing.Point(83, 3);
nudCompletionIntervalMinutes.Name = "nudCompletionIntervalMinutes";
nudCompletionIntervalMinutes.Size = new System.Drawing.Size(44, 27);
nudCompletionIntervalMinutes.TabIndex = 2;
nudCompletionIntervalMinutes.UpDownAlign = System.Windows.Forms.LeftRightAlignment.Left;
//
// label4
//
label4.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom;
label4.AutoSize = true;
label4.Location = new System.Drawing.Point(133, 0);
label4.Name = "label4";
label4.Size = new System.Drawing.Size(22, 33);
label4.TabIndex = 3;
label4.Text = "m";
label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// tableLayoutPanel2 // tableLayoutPanel2
// //
tableLayoutPanel2.AutoSize = true;
tableLayoutPanel2.ColumnCount = 2; 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.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(flowLayoutPanel2, 1, 0); tableLayoutPanel2.Controls.Add(flowLayoutPanel2, 1, 1);
tableLayoutPanel2.Controls.Add(btnReset, 0, 0); tableLayoutPanel2.Controls.Add(btnReset, 0, 1);
tableLayoutPanel2.Controls.Add(flowLayoutPanel3, 0, 0);
tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom; tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
tableLayoutPanel2.Location = new System.Drawing.Point(0, 553); tableLayoutPanel2.Location = new System.Drawing.Point(0, 543);
tableLayoutPanel2.Name = "tableLayoutPanel2"; tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0); tableLayoutPanel2.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
tableLayoutPanel2.RowCount = 1; tableLayoutPanel2.RowCount = 2;
tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
tableLayoutPanel2.Size = new System.Drawing.Size(499, 64); tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
tableLayoutPanel2.Size = new System.Drawing.Size(499, 74);
tableLayoutPanel2.TabIndex = 4; tableLayoutPanel2.TabIndex = 4;
// //
// btnReset // btnReset
// //
btnReset.AutoSize = true; btnReset.AutoSize = true;
btnReset.Location = new System.Drawing.Point(13, 3); btnReset.Location = new System.Drawing.Point(13, 33);
btnReset.Name = "btnReset"; btnReset.Name = "btnReset";
btnReset.Size = new System.Drawing.Size(130, 30); btnReset.Size = new System.Drawing.Size(130, 30);
btnReset.TabIndex = 3; btnReset.TabIndex = 3;
@@ -175,6 +279,29 @@
btnReset.UseVisualStyleBackColor = true; btnReset.UseVisualStyleBackColor = true;
btnReset.Click += btnReset_Click; btnReset.Click += btnReset_Click;
// //
// flowLayoutPanel3
//
flowLayoutPanel3.AutoSize = true;
flowLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
tableLayoutPanel2.SetColumnSpan(flowLayoutPanel3, 2);
flowLayoutPanel3.Controls.Add(lblEnv);
flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
flowLayoutPanel3.Location = new System.Drawing.Point(10, 5);
flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0, 5, 0, 5);
flowLayoutPanel3.Name = "flowLayoutPanel3";
flowLayoutPanel3.Size = new System.Drawing.Size(479, 20);
flowLayoutPanel3.TabIndex = 4;
//
// lblEnv
//
lblEnv.AutoSize = true;
lblEnv.ForeColor = System.Drawing.SystemColors.GrayText;
lblEnv.Location = new System.Drawing.Point(3, 0);
lblEnv.Name = "lblEnv";
lblEnv.Size = new System.Drawing.Size(131, 20);
lblEnv.TabIndex = 0;
lblEnv.Text = "Environment: %E%";
//
// SettingsForm // SettingsForm
// //
AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
@@ -196,9 +323,16 @@
flowLayoutPanel2.ResumeLayout(false); flowLayoutPanel2.ResumeLayout(false);
tableLayoutPanel1.ResumeLayout(false); tableLayoutPanel1.ResumeLayout(false);
tableLayoutPanel1.PerformLayout(); tableLayoutPanel1.PerformLayout();
flowLayoutPanel4.ResumeLayout(false);
flowLayoutPanel4.PerformLayout();
((System.ComponentModel.ISupportInitialize)nudCompletionIntervalHours).EndInit();
((System.ComponentModel.ISupportInitialize)nudCompletionIntervalMinutes).EndInit();
tableLayoutPanel2.ResumeLayout(false); tableLayoutPanel2.ResumeLayout(false);
tableLayoutPanel2.PerformLayout(); tableLayoutPanel2.PerformLayout();
flowLayoutPanel3.ResumeLayout(false);
flowLayoutPanel3.PerformLayout();
ResumeLayout(false); ResumeLayout(false);
PerformLayout();
} }
#endregion #endregion
@@ -214,5 +348,14 @@
private System.Windows.Forms.TextBox tbxDataLocation; private System.Windows.Forms.TextBox tbxDataLocation;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.Button btnReset; private System.Windows.Forms.Button btnReset;
private System.Windows.Forms.CheckBox cbxPreRelease;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel3;
private System.Windows.Forms.Label lblEnv;
private System.Windows.Forms.Label lblCompletionsRefreshWindow;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel4;
private System.Windows.Forms.NumericUpDown nudCompletionIntervalHours;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.NumericUpDown nudCompletionIntervalMinutes;
private System.Windows.Forms.Label label4;
} }
} }

View File

@@ -7,13 +7,14 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using CarManagerV3.Util;
namespace CarManagerV3.Forms namespace CarManagerV3.Forms
{ {
public partial class SettingsForm : Form public partial class SettingsForm : Form
{ {
// Settings map (Maps settings to controls and default values + optional change event handler function that takes previous and new value) // Settings map (Maps settings to controls and default values + optional change event handler function that takes previous and new value)
private Dictionary<string, (Control control, string defaultValue, Action<string, string> onChange)> settingsMap = new Dictionary<string, (Control control, string defaultValue, Action<string, string> onChange)>(); private readonly Dictionary<string, ISettingBinding> settingsMap = new();
public SettingsForm() public SettingsForm()
{ {
@@ -24,11 +25,28 @@ namespace CarManagerV3.Forms
private void initializeSettingsMap() private void initializeSettingsMap()
{ {
// Initialize the settings map with setting keys, associated controls, default values, and optional change event handlers // Initialize the settings map with setting keys, associated controls, default values, and optional change event handlers
settingsMap["DataLocation"] = (tbxDataLocation, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\CarManagerV3", (string before, string after) => settingsMap["DataLocation"] =
{ new SettingBinding<string>(
// TODO control: tbxDataLocation,
} defaultValue: Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\CarManagerV3",
); read: () => Properties.Settings.Default.DataLocation, // strongly typed
write: v => Properties.Settings.Default.DataLocation = v, // strongly typed
onChange: (before, after) =>
{
// TODO: handle path change if needed
});
settingsMap["AllowPrerelease"] =
new SettingBinding<bool>(
control: cbxPreRelease,
defaultValue: false,
read: () => Properties.Settings.Default.AllowPrerelease,
write: v => Properties.Settings.Default.AllowPrerelease = v);
//TODO: implement refresh settings
lblEnv.Text = lblEnv.Text.Replace("%E%", InstallModeDetector.IsInstalledViaMsi() ? "Installed via MSI" : "Running in portable mode");
} }
@@ -39,51 +57,55 @@ namespace CarManagerV3.Forms
private void loadSettings() private void loadSettings()
{ {
// with settings map foreach (var kvp in settingsMap)
foreach (var setting in settingsMap) kvp.Value.Load();
{
string key = setting.Key;
Control control = setting.Value.control;
string value = Properties.Settings.Default[key]?.ToString() ?? string.Empty;
control.Text = value;
}
} }
private void saveSettings() private void saveSettings()
{ {
// Save settings using the settings map bool requiresRestart = false;
foreach (var setting in settingsMap) foreach (var kvp in settingsMap)
{ {
string key = setting.Key; kvp.Value.Save();
Control control = setting.Value.control; if (kvp.Value.RequiresRestart())
string value = control.Text; requiresRestart = true;
string oldValue = Properties.Settings.Default[key]?.ToString() ?? string.Empty; }
// Save the value to application settings
Properties.Settings.Default[key] = value;
// Invoke the change event handler if it exists and the value has changed Properties.Settings.Default.Save();
if (setting.Value.onChange != null && oldValue != value) if(requiresRestart)
{
DialogResult result = MessageBox.Show(
"Some changes you made require a restart to take effect. Do you want to restart now?",
"Restart Required",
MessageBoxButtons.YesNo,
MessageBoxIcon.Information);
if (result == DialogResult.Yes)
{ {
setting.Value.onChange(oldValue, value); Application.Restart();
} else
{
MessageBox.Show("Please restart the application as soon as possible to ensure all changes take effect.", "Restart Recommended", MessageBoxButtons.OK, MessageBoxIcon.Warning);
} }
} }
Properties.Settings.Default.Save();
} }
private void resetSettings() private void resetSettings()
{ {
DialogResult confirmReset = MessageBox.Show("Are you sure you want to reset all settings to their default values? This action cannot be undone.", "Confirm Reset", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); DialogResult confirmReset = MessageBox.Show(
if(confirmReset != DialogResult.Yes) "Are you sure you want to reset all settings to their default values? This action cannot be undone.",
{ "Confirm Reset",
MessageBoxButtons.YesNo,
MessageBoxIcon.Warning);
if (confirmReset != DialogResult.Yes)
return; return;
}
// Reset settings to default values using the settings map foreach (var kvp in settingsMap)
foreach (var setting in settingsMap) kvp.Value.Reset();
{
string key = setting.Key;
string defaultValue = setting.Value.defaultValue;
// Reset the value to default in application settings
Properties.Settings.Default[key] = defaultValue;
}
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
loadSettings(); loadSettings();
} }
@@ -104,4 +126,87 @@ namespace CarManagerV3.Forms
resetSettings(); resetSettings();
} }
} }
internal interface ISettingBinding
{
void Load();
void Save();
void Reset();
bool RequiresRestart();
}
internal sealed class SettingBinding<T> : ISettingBinding
{
private readonly Control control;
private readonly T defaultValue;
private readonly Func<T> read;
private readonly Action<T> write;
private readonly Action<T, T>? onChange;
private readonly bool requiresRestart;
private bool changeRequiresRestart;
public SettingBinding(Control control, T defaultValue, Func<T> read, Action<T> write, bool requiresRestart = false, Action<T, T>? onChange = null)
{
this.control = control;
this.defaultValue = defaultValue;
this.read = read;
this.write = write;
this.onChange = onChange;
this.requiresRestart = requiresRestart;
this.changeRequiresRestart = false;
}
public void Load()
{
T value = read();
ApplyToControl(value);
}
public void Save()
{
T before = read();
T after = ReadFromControl();
write(after);
if (onChange != null && !EqualityComparer<T>.Default.Equals(before, after))
onChange(before, after);
if (requiresRestart && !EqualityComparer<T>.Default.Equals(before, after))
changeRequiresRestart = true;
}
public void Reset() => write(defaultValue);
public bool RequiresRestart() => changeRequiresRestart;
private void ApplyToControl(T value)
{
switch (control)
{
case TextBox tb:
tb.Text = value?.ToString() ?? string.Empty;
break;
case CheckBox cb:
cb.Checked = value is bool b ? b : Convert.ToBoolean(value);
break;
default:
throw new NotSupportedException($"Control type '{control.GetType().Name}' not supported for {typeof(T).Name}.");
}
}
private T ReadFromControl()
{
object result = control switch
{
TextBox tb when typeof(T) == typeof(string) => tb.Text,
CheckBox cb when typeof(T) == typeof(bool) => cb.Checked,
_ => throw new NotSupportedException($"Cannot read {typeof(T).Name} from control type '{control.GetType().Name}'.")
};
return (T)result;
}
}
} }

View File

@@ -0,0 +1,191 @@
namespace CarManagerV3.Forms
{
partial class UpdatePromptForm
{
/// <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()
{
flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
lblUpdateTitleStatic = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
lblInstalledVersion = new System.Windows.Forms.Label();
lblLatestVersion = new System.Windows.Forms.Label();
tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
btnInstallUpdate = new System.Windows.Forms.Button();
btnDismissUpdate = new System.Windows.Forms.Button();
btnReadChangelog = new System.Windows.Forms.Button();
flowLayoutPanel1.SuspendLayout();
tableLayoutPanel1.SuspendLayout();
flowLayoutPanel2.SuspendLayout();
SuspendLayout();
//
// flowLayoutPanel1
//
flowLayoutPanel1.Controls.Add(lblUpdateTitleStatic);
flowLayoutPanel1.Controls.Add(label2);
flowLayoutPanel1.Controls.Add(lblInstalledVersion);
flowLayoutPanel1.Controls.Add(lblLatestVersion);
flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top;
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
flowLayoutPanel1.Location = new System.Drawing.Point(10, 20);
flowLayoutPanel1.Name = "flowLayoutPanel1";
flowLayoutPanel1.Size = new System.Drawing.Size(846, 125);
flowLayoutPanel1.TabIndex = 0;
//
// lblUpdateTitleStatic
//
lblUpdateTitleStatic.AutoSize = true;
lblUpdateTitleStatic.Font = new System.Drawing.Font("Segoe UI", 14F);
lblUpdateTitleStatic.Location = new System.Drawing.Point(3, 0);
lblUpdateTitleStatic.Name = "lblUpdateTitleStatic";
lblUpdateTitleStatic.Size = new System.Drawing.Size(298, 32);
lblUpdateTitleStatic.TabIndex = 4;
lblUpdateTitleStatic.Text = "A new Version is Available!";
//
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(3, 32);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(600, 20);
label2.TabIndex = 5;
label2.Text = "A new version of Car Manager 3 has been released. Update now to get the latest features.";
//
// lblInstalledVersion
//
lblInstalledVersion.AutoSize = true;
lblInstalledVersion.Location = new System.Drawing.Point(3, 57);
lblInstalledVersion.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0);
lblInstalledVersion.Name = "lblInstalledVersion";
lblInstalledVersion.Size = new System.Drawing.Size(123, 20);
lblInstalledVersion.TabIndex = 6;
lblInstalledVersion.Text = "Your version: ?.?.?";
//
// lblLatestVersion
//
lblLatestVersion.AutoSize = true;
lblLatestVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold);
lblLatestVersion.Location = new System.Drawing.Point(3, 77);
lblLatestVersion.Name = "lblLatestVersion";
lblLatestVersion.Size = new System.Drawing.Size(144, 20);
lblLatestVersion.TabIndex = 7;
lblLatestVersion.Text = "Latest version: ?.?.?";
//
// tableLayoutPanel1
//
tableLayoutPanel1.ColumnCount = 2;
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
tableLayoutPanel1.Controls.Add(flowLayoutPanel2, 1, 0);
tableLayoutPanel1.Controls.Add(btnReadChangelog, 0, 0);
tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
tableLayoutPanel1.Location = new System.Drawing.Point(10, 393);
tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.RowCount = 1;
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
tableLayoutPanel1.Size = new System.Drawing.Size(846, 47);
tableLayoutPanel1.TabIndex = 1;
//
// flowLayoutPanel2
//
flowLayoutPanel2.Controls.Add(btnInstallUpdate);
flowLayoutPanel2.Controls.Add(btnDismissUpdate);
flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
flowLayoutPanel2.Location = new System.Drawing.Point(423, 0);
flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
flowLayoutPanel2.Name = "flowLayoutPanel2";
flowLayoutPanel2.Size = new System.Drawing.Size(423, 47);
flowLayoutPanel2.TabIndex = 0;
//
// btnInstallUpdate
//
btnInstallUpdate.AutoSize = true;
btnInstallUpdate.Location = new System.Drawing.Point(320, 3);
btnInstallUpdate.Name = "btnInstallUpdate";
btnInstallUpdate.Size = new System.Drawing.Size(100, 30);
btnInstallUpdate.TabIndex = 0;
btnInstallUpdate.Text = "Update now";
btnInstallUpdate.UseVisualStyleBackColor = true;
btnInstallUpdate.Click += btnInstallUpdate_Click;
//
// btnDismissUpdate
//
btnDismissUpdate.Location = new System.Drawing.Point(220, 3);
btnDismissUpdate.Name = "btnDismissUpdate";
btnDismissUpdate.Size = new System.Drawing.Size(94, 29);
btnDismissUpdate.TabIndex = 1;
btnDismissUpdate.Text = "Dismiss";
btnDismissUpdate.UseVisualStyleBackColor = true;
btnDismissUpdate.Click += btnDismissUpdate_Click;
//
// btnReadChangelog
//
btnReadChangelog.Location = new System.Drawing.Point(3, 3);
btnReadChangelog.Name = "btnReadChangelog";
btnReadChangelog.Size = new System.Drawing.Size(94, 29);
btnReadChangelog.TabIndex = 1;
btnReadChangelog.Text = "Changelog";
btnReadChangelog.UseVisualStyleBackColor = true;
btnReadChangelog.Click += btnReadChangelog_Click;
//
// UpdatePromptForm
//
AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
ClientSize = new System.Drawing.Size(866, 450);
Controls.Add(tableLayoutPanel1);
Controls.Add(flowLayoutPanel1);
FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
MaximizeBox = false;
MinimizeBox = false;
Name = "UpdatePromptForm";
Padding = new System.Windows.Forms.Padding(10, 20, 10, 10);
Text = "Update Car Manager 3";
TopMost = true;
flowLayoutPanel1.ResumeLayout(false);
flowLayoutPanel1.PerformLayout();
tableLayoutPanel1.ResumeLayout(false);
flowLayoutPanel2.ResumeLayout(false);
flowLayoutPanel2.PerformLayout();
ResumeLayout(false);
}
#endregion
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
private System.Windows.Forms.Label lblUpdateTitleStatic;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label lblInstalledVersion;
private System.Windows.Forms.Label lblLatestVersion;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
private System.Windows.Forms.Button btnInstallUpdate;
private System.Windows.Forms.Button btnDismissUpdate;
private System.Windows.Forms.Button btnReadChangelog;
}
}

View File

@@ -0,0 +1,59 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using CarManagerV3.Manager;
namespace CarManagerV3.Forms
{
public partial class UpdatePromptForm : Form
{
public UpdatePromptForm(string currentVersion, string latestVersion)
{
InitializeComponent();
lblInstalledVersion.Text = lblInstalledVersion.Text.Replace("?.?.?", currentVersion);
lblLatestVersion.Text = lblLatestVersion.Text.Replace("?.?.?", latestVersion);
if (Updater.IsLatestVersionPrerelease())
{
lblLatestVersion.Text += " (Pre-release)";
}
}
private void btnDismissUpdate_Click(object sender, EventArgs e)
{
this.Close();
}
private void btnInstallUpdate_Click(object sender, EventArgs e)
{
PleaseWait loadForm = new PleaseWait("Downloading the newest version...");
try
{
this.Enabled = false;
loadForm.Show();
Application.DoEvents();
//return;
Updater.DownloadNewestInstaller();
}
catch (Exception ex)
{
MessageBox.Show("An error occurred while trying to download the update: " + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
this.Enabled = true;
loadForm.Close();
this.Close();
}
private void btnReadChangelog_Click(object sender, EventArgs e)
{
Updater.OpenReleasePage();
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -28,65 +28,90 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.progressBar1 = new System.Windows.Forms.ProgressBar(); label1 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label(); lblContent = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); animatedProgressBar1 = new AnimatedProgressBar();
this.SuspendLayout(); flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
// flowLayoutPanel1.SuspendLayout();
// progressBar1 SuspendLayout();
//
this.progressBar1.Location = new System.Drawing.Point(12, 62);
this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(422, 23);
this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
this.progressBar1.TabIndex = 0;
this.progressBar1.Click += new System.EventHandler(this.progressBar1_Click);
// //
// label1 // label1
// //
this.label1.AutoSize = true; label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 0);
this.label1.Location = new System.Drawing.Point(12, 13); label1.Location = new System.Drawing.Point(13, 10);
this.label1.Name = "label1"; label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(121, 20); label1.Size = new System.Drawing.Size(140, 25);
this.label1.TabIndex = 1; label1.TabIndex = 1;
this.label1.Text = "Please wait..."; label1.Text = "Please wait...";
label1.UseWaitCursor = true;
// //
// label2 // lblContent
// //
this.label2.AutoSize = true; lblContent.AutoSize = true;
this.label2.Location = new System.Drawing.Point(13, 33); lblContent.Location = new System.Drawing.Point(13, 40);
this.label2.Name = "label2"; lblContent.Margin = new System.Windows.Forms.Padding(3, 5, 3, 10);
this.label2.Size = new System.Drawing.Size(133, 16); lblContent.Name = "lblContent";
this.label2.TabIndex = 2; lblContent.Size = new System.Drawing.Size(144, 20);
this.label2.Text = "Saving your changes"; lblContent.TabIndex = 2;
lblContent.Text = "Saving your changes";
lblContent.UseWaitCursor = true;
//
// animatedProgressBar1
//
animatedProgressBar1.Location = new System.Drawing.Point(13, 73);
animatedProgressBar1.Name = "animatedProgressBar1";
animatedProgressBar1.PrimaryColor = System.Drawing.Color.FromArgb(0, 120, 215);
animatedProgressBar1.ProgressBackColor = System.Drawing.Color.FromArgb(240, 240, 240);
animatedProgressBar1.SecondaryColor = System.Drawing.Color.FromArgb(100, 180, 255);
animatedProgressBar1.Size = new System.Drawing.Size(408, 22);
animatedProgressBar1.TabIndex = 3;
animatedProgressBar1.UseWaitCursor = true;
//
// flowLayoutPanel1
//
flowLayoutPanel1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom;
flowLayoutPanel1.Controls.Add(label1);
flowLayoutPanel1.Controls.Add(lblContent);
flowLayoutPanel1.Controls.Add(animatedProgressBar1);
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
flowLayoutPanel1.Name = "flowLayoutPanel1";
flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(10);
flowLayoutPanel1.Size = new System.Drawing.Size(437, 153);
flowLayoutPanel1.TabIndex = 4;
flowLayoutPanel1.UseWaitCursor = true;
flowLayoutPanel1.WrapContents = false;
// //
// PleaseWait // PleaseWait
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true; AutoSize = true;
this.ClientSize = new System.Drawing.Size(446, 97); ClientSize = new System.Drawing.Size(437, 153);
this.ControlBox = false; ControlBox = false;
this.Controls.Add(this.label2); Controls.Add(flowLayoutPanel1);
this.Controls.Add(this.label1); FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Controls.Add(this.progressBar1); Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; MaximizeBox = false;
this.MaximizeBox = false; MinimizeBox = false;
this.MinimizeBox = false; Name = "PleaseWait";
this.Name = "PleaseWait"; ShowIcon = false;
this.ShowIcon = false; ShowInTaskbar = false;
this.ShowInTaskbar = false; StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Please Wait"; Text = "Please Wait";
this.ResumeLayout(false); TopMost = true;
this.PerformLayout(); UseWaitCursor = true;
flowLayoutPanel1.ResumeLayout(false);
flowLayoutPanel1.PerformLayout();
ResumeLayout(false);
} }
#endregion #endregion
private System.Windows.Forms.ProgressBar progressBar1;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label lblContent;
private AnimatedProgressBar animatedProgressBar1;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
} }
} }

View File

@@ -5,13 +5,19 @@ namespace CarManagerV3
{ {
public partial class PleaseWait : Form public partial class PleaseWait : Form
{ {
public PleaseWait() public PleaseWait(string content = "Saving your changes...")
{ {
InitializeComponent(); InitializeComponent();
this.SetStyle(ControlStyles.OptimizedDoubleBuffer |
ControlStyles.AllPaintingInWmPaint |
ControlStyles.UserPaint, true);
// loading animation // loading animation
progressBar1.Style = ProgressBarStyle.Marquee; animatedProgressBar1.StartAnimation();
progressBar1.MarqueeAnimationSpeed = 30; lblContent.Text = content;
} }
private void progressBar1_Click(object sender, EventArgs e) private void progressBar1_Click(object sender, EventArgs e)

View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
Version 2.0 Version 2.0
The primary goals of this format is to allow a simple XML format The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes various data types are done through the TypeConverter classes
associated with the data types. associated with the data types.
Example: Example:
... ado.net/XML headers & schema ... ... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader> <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment> <comment>This is a comment</comment>
</data> </data>
There are any number of "resheader" rows that contain simple There are any number of "resheader" rows that contain simple
name/value pairs. name/value pairs.
Each data row contains a name, and value. The row also contains a Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture. text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the Classes that don't support this are serialized and stored with the
mimetype set. mimetype set.
The mimetype is used for serialized objects, and tells the The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly: extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below. read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64 mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64 mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64 mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->

View File

@@ -50,11 +50,11 @@ namespace CarManagerV3
{ {
try try
{ {
//string directory = Path.GetDirectoryName(path); string directory = Path.GetDirectoryName(path);
Console.WriteLine($"Initializing file and folders for path: {path}"); Console.WriteLine($"Initializing file and folders for path: {path}");
if (!Directory.Exists(path)) if (!Directory.Exists(directory))
{ {
Directory.CreateDirectory(path); Directory.CreateDirectory(directory);
} }
if(!folderOnly) InitializeFile(path); if(!folderOnly) InitializeFile(path);
} }
@@ -64,6 +64,26 @@ namespace CarManagerV3
} }
} }
/// <summary>
/// Ensures the directory exists.
/// </summary>
/// <param name="path">The path.</param>
public static void EnsureDirectoryExists(string path)
{
try
{
string directory = Path.GetDirectoryName(path);
if (directory != null && !Directory.Exists(directory))
{
Directory.CreateDirectory(directory);
}
}
catch (Exception ex)
{
Console.Error.WriteLine($"Error ensuring directory exists: {ex.Message}");
}
}
/// <summary> /// <summary>
/// Reads cars from a specified file path. /// Reads cars from a specified file path.
/// </summary> /// </summary>

View File

@@ -0,0 +1,226 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace CarManagerV3.Manager
{
internal class Updater
{
private static readonly string GitApiUrl = "https://git.jaro.digital/api/v1";
private static readonly string GitRepoOwner = "frozd";
private static readonly string GitRepoName = "carmanager-3";
private static readonly string GitApiRepoUrl = $"{GitApiUrl}/repos/{GitRepoOwner}/{GitRepoName}";
private static readonly string LatestReleaseEndpoint = $"{GitApiRepoUrl}/releases/latest";
private static readonly string PreReleaseEndpoint = $"{GitApiRepoUrl}/releases?limit=1&pre-release=true";
private static string latestVersionCache = null;
private static DateTime lastChecked = DateTime.MinValue;
private static readonly int CacheDurationMinutes = 60;
private static bool cacheIncludesPrerelease = false;
private static readonly string debugVersion = null;//"1.2.0";
private static bool isLatestVersionPrerelease = false;
public static string GetCurrentVersion(bool cutTrailingZeros = false)
{
//DEBUG::
if (debugVersion != null)
{
return debugVersion;
}
var asm = Assembly.GetEntryAssembly()!;
Version v = asm.GetName().Version ?? new Version(0, 0, 0, 0);
string VersionString = v.ToString();
if(cutTrailingZeros)
{
// Remove trailing .0 parts
while (VersionString.EndsWith(".0"))
{
VersionString = VersionString.Substring(0, VersionString.Length - 2);
}
return VersionString;
}
return VersionString;
}
private static bool IsCacheValid(bool includePreRelease = false)
{
return includePreRelease == cacheIncludesPrerelease && latestVersionCache != null && (DateTime.Now - lastChecked).TotalMinutes < CacheDurationMinutes;
}
private static void InvalidateCache()
{
latestVersionCache = null;
lastChecked = DateTime.MinValue;
}
private static void SetCache(string version, bool includePreRelease = false)
{
latestVersionCache = version;
cacheIncludesPrerelease = includePreRelease;
lastChecked = DateTime.Now;
}
public static string GetLatestVersion(bool includePreRelease = false)
{
if (IsCacheValid(includePreRelease))
{
System.Diagnostics.Debug.WriteLine("Using cached latest version: " + latestVersionCache);
return latestVersionCache;
}
string latestVersion = null;
// Get the latest stable version first
using (var client = new System.Net.Http.HttpClient())
{
var response = client.GetAsync(LatestReleaseEndpoint).Result;
if (response.IsSuccessStatusCode)
{
var content = response.Content.ReadAsStringAsync().Result;
dynamic release = Newtonsoft.Json.JsonConvert.DeserializeObject(content);
latestVersion = release.tag_name;
isLatestVersionPrerelease = false;
}
}
// If pre-release is requested, check for the latest pre-release version
if (includePreRelease)
{
using (var client = new System.Net.Http.HttpClient())
{
UrlEncoder encoder = System.Text.Encodings.Web.UrlEncoder.Default;
var response = client.GetAsync(PreReleaseEndpoint).Result;
if (response.IsSuccessStatusCode)
{
var content = response.Content.ReadAsStringAsync().Result;
dynamic releases = Newtonsoft.Json.JsonConvert.DeserializeObject(content);
//System.Diagnostics.Debug.WriteLine("Fetched pre-release versions, count: " + releases.Count);
if (releases.Count > 0)
{
var preReleaseVersion = releases[0].tag_name.ToString();
//System.Diagnostics.Debug.WriteLine("Latest unstable version: " + preReleaseVersion);
// Compare versions and return the newer one
if (IsNewerVersion(preReleaseVersion, latestVersion))
{
latestVersion = preReleaseVersion;
isLatestVersionPrerelease = true;
}
}
}
else
{
System.Diagnostics.Debug.WriteLine("Failed to fetch pre-release versions, status code: " + response.StatusCode + " at: " + PreReleaseEndpoint);
}
}
}
SetCache(latestVersion, includePreRelease);
return latestVersion;
}
public static bool IsNewerVersion(string versionA, string versionB)
{
if (versionA == null) return false;
if (versionB == null) return true;
Version vA = new Version(versionA.TrimStart('v'));
Version vB = new Version(versionB.TrimStart('v'));
return vA > vB;
}
public static void DownloadNewestInstaller(bool includePreRelease = false)
{
string latestVersion = GetLatestVersion(includePreRelease);
if (latestVersion == null)
{
throw new Exception("Could not fetch latest version from Git API.");
}
string releaseUrl = $"{GitApiRepoUrl}/releases/tags/{latestVersion}";
using (var client = new System.Net.Http.HttpClient())
{
var response = client.GetAsync(releaseUrl).Result;
if (response.IsSuccessStatusCode)
{
var content = response.Content.ReadAsStringAsync().Result;
dynamic release = Newtonsoft.Json.JsonConvert.DeserializeObject(content);
string downloadUrl = null;
foreach (var asset in release.assets)
{
// file that ends with .msi
if (asset.name.ToString().EndsWith(".msi"))
{
downloadUrl = asset.browser_download_url;
break;
}
}
if (downloadUrl != null)
{
// Download the installer to the users set Data dir, run it, and then exit the application.
string tempFilePath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), $"CarManagerInstaller_{latestVersion}.msi");
using (var downloadClient = new System.Net.WebClient())
{
downloadClient.DownloadFile(downloadUrl, tempFilePath);
}
// Use ProcessStartInfo with UseShellExecute to launch the MSI file
var processStartInfo = new System.Diagnostics.ProcessStartInfo
{
FileName = tempFilePath,
UseShellExecute = true
};
System.Diagnostics.Process.Start(processStartInfo);
Application.Exit();
}
else
{
throw new Exception("Could not find installer asset in the latest release.");
}
}
else
{
throw new Exception("Could not fetch release information from Git API.");
}
}
}
public static bool IsUpdateAvailable(bool includePreRelease = false)
{
string currentVersion = GetCurrentVersion();
string latestVersion = GetLatestVersion(includePreRelease);
return IsNewerVersion(latestVersion, currentVersion);
}
public static void OpenReleasePage(string version = null)
{
if (version == null)
{
version = GetLatestVersion(true);
}
string releaseUrl = $"https://git.jaro.digital/{GitRepoOwner}/{GitRepoName}/releases/tag/{version}";
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo
{
FileName = releaseUrl,
UseShellExecute = true
});
}
public static bool IsLatestVersionPrerelease()
{
// Ensure we have the latest version info in cache
return isLatestVersionPrerelease;
}
}
}

View File

@@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="CarCompleteData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\merged-cars.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="Icon_Add" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Icon_Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icon_Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Icon_Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>

View File

@@ -34,5 +34,41 @@ namespace CarManagerV3.Properties {
this["DataLocation"] = value; this["DataLocation"] = value;
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool AllowPrerelease {
get {
return ((bool)(this["AllowPrerelease"]));
}
set {
this["AllowPrerelease"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("2026-01-01")]
public global::System.DateTime LastFetchedAutoCompletions {
get {
return ((global::System.DateTime)(this["LastFetchedAutoCompletions"]));
}
set {
this["LastFetchedAutoCompletions"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("24.00:00:00")]
public global::System.TimeSpan FetchAutoCompletionsInterval {
get {
return ((global::System.TimeSpan)(this["FetchAutoCompletionsInterval"]));
}
set {
this["FetchAutoCompletionsInterval"] = value;
}
}
} }
} }

View File

@@ -5,5 +5,14 @@
<Setting Name="DataLocation" Type="System.String" Scope="User"> <Setting Name="DataLocation" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="AllowPrerelease" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="LastFetchedAutoCompletions" Type="System.DateTime" Scope="User">
<Value Profile="(Default)">2026-01-01</Value>
</Setting>
<Setting Name="FetchAutoCompletionsInterval" Type="System.TimeSpan" Scope="User">
<Value Profile="(Default)">24.00:00:00</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,261 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using CarManagerV3.Classes;
namespace CarManagerV3.Util
{
/// <summary>
/// Provides car manufacturer and model autocompletion data for the application.
/// Manages fetching, caching, and retrieval of car brand and model information from remote sources and local storage.
/// </summary>
/// <remarks>
/// This class maintains a static list of car manufacturers and their models, supports fetching updated data from remote URLs,
/// and caches the data locally for offline use. It implements retry logic to prevent excessive network requests.
/// </remarks>
internal class CarCompletions
{
/// <summary>
/// A list of URLs that should be used to fetch the json file with autocompletion data.
/// Multiple URLs are provided to ensure that if one source is unavailable, the others can be used as a fallback. The application should attempt to fetch the data from each URL in order until it successfully retrieves the data or exhausts all options.
/// </summary>
private static readonly string[] carDataFileUrls =
{
"https://static.clsw.app/carmgm/merged-cars.json"
};
/// <summary>
/// The filename for the cached car completion data in the user's data directory.
/// </summary>
private static readonly string carCompletionDataFileName = "car_data.json";
/// <summary>
/// The timestamp of the last fetch attempt for car completion data.
/// Used to implement retry throttling to prevent excessive network requests.
/// </summary>
private static DateTime lastFetchAttempt = Properties.Settings.Default.LastFetchedAutoCompletions;
/// <summary>
/// The minimum time interval that must elapse between fetch attempts.
/// Prevents excessive retry attempts when the remote source is unavailable.
/// </summary>
private static readonly TimeSpan fetchRetryInterval = Properties.Settings.Default.FetchAutoCompletionsInterval; // Minimum interval between fetch attempts
/// <summary>
/// Gets the full file path for the car completion data file.
/// Ensures that the user data directory exists before returning the path.
/// </summary>
/// <returns>The full file path to the car completion data file in the user's data directory.</returns>
private static string getCarCompletionDataFilePath()
{
var userDataDir = Properties.Settings.Default.DataLocation;
SafeManager.EnsureDirectoryExists(userDataDir);
return Path.Combine(userDataDir, carCompletionDataFileName);
}
/// <summary>
/// The static list of car manufacturers and their available models.
/// This list serves as the default data and is updated when fetching from remote sources or local cache.
/// </summary>
public static List<CarManufacturer> carBrands = new List<CarManufacturer>
{
new CarManufacturer("Toyota") { Models = new List<string> { "Camry", "Corolla", "RAV4" } },
new CarManufacturer("Honda") { Models = new List<string> { "Civic", "Accord", "CR-V" } },
new CarManufacturer("Ford") { Models = new List<string> { "F-150", "Mustang", "Escape" } },
new CarManufacturer("Chevrolet") { Models = new List<string> { "Silverado", "Malibu", "Equinox" } },
new CarManufacturer("BMW") { Models = new List<string> { "3 Series", "5 Series", "X5" } },
new CarManufacturer("Mercedes-Benz") { Models = new List<string> { "C-Class", "E-Class", "GLC" } },
new CarManufacturer("Audi") { Models = new List<string> { "A4", "A6", "Q5" } },
new CarManufacturer("Volkswagen") { Models = new List<string> { "Golf", "Passat", "Tiguan" } },
new CarManufacturer("Nissan") { Models = new List<string> { "Altima", "Sentra", "Rogue" } },
new CarManufacturer("Hyundai") { Models = new List<string> { "Elantra", "Sonata", "Tucson" } },
new CarManufacturer("SEAT") { Models = new List<string> { "Ibiza", "Leon", "Ateca", "Alhambra" } },
new CarManufacturer("Skoda") { Models = new List<string> { "Octavia", "Fabia", "Kodiaq" } },
};
/// <summary>
/// Gets the full list of car brands.
/// </summary>
/// <returns>A list of strings containing all available car manufacturer names.</returns>
public static List<string> GetCarBrands()
{
return carBrands.Select(c => c.Name).ToList();
}
/// <summary>
/// Retrieves the list of car models for a specified brand.
/// The search is case-insensitive.
/// </summary>
/// <param name="brand">The name of the car brand to search for.</param>
/// <returns>A list of car models for the specified brand, or an empty list if the brand is not found.</returns>
public static List<string> GetCarModels(string brand)
{
var manufacturer = carBrands.FirstOrDefault(c => c.Name.Equals(brand, StringComparison.OrdinalIgnoreCase));
return manufacturer != null ? manufacturer.Models : new List<string>();
}
/// <summary>
/// A predefined list of common car colors for autocompletion purposes.
/// Provides standard color options that are frequently used in vehicle descriptions.
/// </summary>
public static List<string> CommonColors = new List<string>
{
"Black", "White", "Gray", "Silver", "Red", "Blue", "Green", "Yellow", "Brown", "Orange"
};
/// <summary>
/// Reads car completion data from an embedded resource file.
/// This method is intended to populate the carBrands list from a JSON resource embedded in the project.
/// </summary>
/// <remarks>
/// The expected resource format is a JSON object where keys are car brand names and values are lists of model names.
/// Resource name: CarCompleteData (JSON file format).
/// Currently not implemented.
/// </remarks>
public static void ReadFromResourceFile()
{
// Read the json file from the projects resources and populate the carBrands list
// Format is a json object with the key being the car brand and the value being a list of models
// Get the json string from the resources, Resource name is CarCompleteData, it is a .json file
}
/// <summary>
/// Fetches the car data from urls asynchronous and saves it in the users data directory for offline use.
/// </summary>
/// <returns>A task representing the asynchronous operation.</returns>
/// <remarks>
/// This method implements retry throttling using the <see cref="fetchRetryInterval"/> to prevent excessive network requests.
/// It attempts to fetch data from each URL in <see cref="carDataFileUrls"/> in order until successful or all URLs are exhausted.
/// The fetched data is saved to the local file system for offline access.
/// </remarks>
public static async Task FetchCarCompletionDataFromUrlsAsync()
{
if(DateTime.Now - lastFetchAttempt < fetchRetryInterval)
{
System.Diagnostics.Debug.WriteLine("Fetch attempt skipped to avoid excessive retries. Last attempt was at " + lastFetchAttempt);
Console.WriteLine("Fetch attempt skipped to avoid excessive retries. Last attempt was at " + lastFetchAttempt);
return;
}
foreach (var url in carDataFileUrls)
{
try
{
lastFetchAttempt = DateTime.Now;
Properties.Settings.Default.LastFetchedAutoCompletions = lastFetchAttempt;
Properties.Settings.Default.Save();
using var httpClient = new HttpClient();
var response = await httpClient.GetAsync(url);
response.EnsureSuccessStatusCode();
var jsonData = await response.Content.ReadAsStringAsync();
// Saves the json data to a file in the user's data directory for offline use
var filePath = getCarCompletionDataFilePath();
await File.WriteAllTextAsync(filePath, jsonData);
System.Diagnostics.Debug.WriteLine($"Successfully fetched car data from {url} and saved to {filePath}");
break; // Exit the loop if data is successfully fetched
}
catch (Exception ex)
{
// Log the error and try the next URL
System.Diagnostics.Debug.WriteLine($"Failed to fetch car data from {url}: {ex.Message}");
Console.WriteLine($"Failed to fetch car data from {url}: {ex.Message}");
}
}
}
/// <summary>
/// Fetches the car data from urls and saves it in the users data directory for offline use.
/// This is a synchronous wrapper that blocks until the asynchronous fetch operation completes.
/// </summary>
/// <returns>A task representing the synchronous operation.</returns>
/// <remarks>
/// This method wraps <see cref="FetchCarCompletionDataFromUrlsAsync"/> and runs it synchronously.
/// Consider using the async version directly when possible to avoid blocking the thread.
/// </remarks>
public static Task FetchCarCompletionDataFromUrls()
{
// Run synchronously
return Task.Run(() => FetchCarCompletionDataFromUrlsAsync().Wait());
}
/// <summary>
/// Loads car manufacturer data from the locally cached file.
/// Optionally fetches updated data from remote sources before loading from file.
/// </summary>
/// <param name="skipOnlineUpdate">If true, skips fetching data from remote sources and only reads from the local cache. Default is false.</param>
/// <returns>A list of <see cref="CarManufacturer"/> objects populated from the cached file, or an empty list if the file doesn't exist or an error occurs.</returns>
/// <remarks>
/// The expected file format is a JSON object where keys are car brand names and values are lists of model names.
/// If the file doesn't exist or cannot be read, an error message is logged and an empty list is returned.
/// </remarks>
public static List<CarManufacturer> GetFromFile(bool skipOnlineUpdate = false)
{
if (!skipOnlineUpdate) FetchCarCompletionDataFromUrls();
var filePath = getCarCompletionDataFilePath();
if (File.Exists(filePath))
{
try
{
var jsonData = File.ReadAllText(filePath);
// Parse the json data and populate the carBrands list
// Format is a json object with the key being the car brand and the value being a list of models
var carData = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, List<string>>>(jsonData);
List<CarManufacturer> _carBrands = carData.Select(kvp => new CarManufacturer(kvp.Key) { Models = kvp.Value }).ToList();
return _carBrands;
}
catch (Exception ex)
{
// Silent error.
Console.WriteLine($"Failed to read car data from file: {ex.Message}");
}
}
else
{
Console.Error.WriteLine("Car data file not found. Please ensure that the data has been fetched successfully at least once.");
}
return new List<CarManufacturer>();
}
/// <summary>
/// Updates the static <see cref="carBrands"/> list with data from the local cache file.
/// Only updates the list if the cached file contains valid data.
/// </summary>
/// <param name="skipOnlineUpdate">If true, skips fetching data from remote sources before updating. Default is false.</param>
/// <remarks>
/// This method calls <see cref="GetFromFile"/> and updates <see cref="carBrands"/> only if the returned list is not empty.
/// If no data is retrieved, the existing <see cref="carBrands"/> list remains unchanged.
/// </remarks>
public static void UpdateCarCompletionData(bool skipOnlineUpdate = false)
{
var updatedCarBrands = GetFromFile(skipOnlineUpdate);
if (updatedCarBrands.Count > 0)
{
carBrands = updatedCarBrands;
}
}
/// <summary>
/// Asynchronously updates the car completion data by fetching from remote sources and updating the local cache.
/// This is the recommended method for refreshing car data in the application.
/// </summary>
/// <returns>A task representing the asynchronous update operation.</returns>
/// <remarks>
/// This method first attempts to fetch updated data from remote URLs using <see cref="FetchCarCompletionDataFromUrlsAsync"/>,
/// then updates the static <see cref="carBrands"/> list from the local cache using <see cref="UpdateCarCompletionData"/>.
/// </remarks>
public static async Task UpdateCarCompletionDataAsync()
{
await FetchCarCompletionDataFromUrlsAsync();
System.Diagnostics.Debug.WriteLine("Car completion data fetch attempt completed. Now updating local data.");
UpdateCarCompletionData(true);
}
}
}

View File

@@ -0,0 +1,38 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using Microsoft.Win32;
namespace CarManagerV3.Util
{
public static class InstallModeDetector
{
private const string _keyPath = @"Software\Jaro Digital\CarManager3";
private const string KeyPath = _keyPath;
private const string ValueName = "InstallType";
public static bool IsInstalledViaMsi()
{
// Prefer HKLM if your MSI is per-machine; fallback to HKCU if per-user.
System.Diagnostics.Debug.WriteLine($"Checking registry for install type at HKLM\\{KeyPath} and HKCU\\{KeyPath}");
object? val =
Registry.GetValue($@"HKEY_LOCAL_MACHINE\{KeyPath}", ValueName, null)
?? Registry.GetValue($@"HKEY_CURRENT_USER\{KeyPath}", ValueName, null);
return val is string s && string.Equals(s, "MSI", StringComparison.OrdinalIgnoreCase);
}
public static bool IsPortable() => !IsInstalledViaMsi();
public static string GetInstallType()
{
object? val =
Registry.GetValue($@"HKEY_LOCAL_MACHINE\{KeyPath}", ValueName, null)
?? Registry.GetValue($@"HKEY_CURRENT_USER\{KeyPath}", ValueName, null);
return val as string ?? "Unknown";
}
}
}