diff --git a/.gitignore b/.gitignore
index 432b9b3..9a1e321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -255,3 +255,4 @@ paket-files/
# JetBrains Rider
.idea/
*.sln.iml
+.vscode/settings.json
diff --git a/imagecatalog/AvaloniaApp.axaml b/imagecatalog/AvaloniaApp.axaml
index 8ce9be1..e4a021d 100644
--- a/imagecatalog/AvaloniaApp.axaml
+++ b/imagecatalog/AvaloniaApp.axaml
@@ -3,6 +3,8 @@
x:Class="ImageCatalog_2.AvaloniaApp">
+
+
diff --git a/imagecatalog/AvaloniaMainWindow.axaml b/imagecatalog/AvaloniaMainWindow.axaml
index 4517b63..e9f6ef2 100644
--- a/imagecatalog/AvaloniaMainWindow.axaml
+++ b/imagecatalog/AvaloniaMainWindow.axaml
@@ -1,11 +1,12 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:views="clr-namespace:ImageCatalog_2.AvaloniaViews"
+ xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
+ x:Class="ImageCatalog_2.AvaloniaMainWindow"
+ mc:Ignorable="d"
+ Title="Image Catalog - Avalonia" Height="540" Width="800">
@@ -16,54 +17,124 @@
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
-
+
+
+ IsEnabled="{Binding UiEnabled}">
+
+
+
+
+
+ Command="{Binding AsyncCancelOperationCommand}">
+
+
+
+
+
diff --git a/imagecatalog/ImageCatalog 2 - Backup.csproj b/imagecatalog/ImageCatalog 2 - Backup.csproj
deleted file mode 100644
index c77aca9..0000000
--- a/imagecatalog/ImageCatalog 2 - Backup.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- WinExe
- net8.0-windows
- enable
- enable
- true
- False
- 3.0.0.0
- 3.0.0.0
- 3.0.0-alpha.63+Branch.develop.Sha.39a9baf5c618d8d79c75b89e2d5c4020939697f2
- 3.0.0-alpha0063
-
-
- true
-
-
- embedded
-
-
- embedded
-
-
-
- MyApplicationCodeGenerator
- Application.Designer.cs
-
-
- SettingsSingleFileGenerator
- Settings.Designer.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- all
-
-
- All
-
-
-
-
- True
- True
- Settings.settings
-
-
-
-
\ No newline at end of file
diff --git a/imagecatalog/ImageCatalog 2.csproj b/imagecatalog/ImageCatalog 2.csproj
index 36ac938..be6394f 100644
--- a/imagecatalog/ImageCatalog 2.csproj
+++ b/imagecatalog/ImageCatalog 2.csproj
@@ -51,17 +51,18 @@
-
+
+
-
-
-
-
+
+
+
+
all
diff --git a/imagecatalog/ImageCatalog 2.vbproj b/imagecatalog/ImageCatalog 2.vbproj
deleted file mode 100644
index b8cc359..0000000
--- a/imagecatalog/ImageCatalog 2.vbproj
+++ /dev/null
@@ -1,347 +0,0 @@
-
-
-
- Local
- 9.0.30729
- 2.0
- {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}
- Debug
- AnyCPU
-
-
-
-
- ImageCatalog
-
-
- None
- JScript
- Grid
- IE50
- false
- WinExe
- Binary
- On
- On
- ImageCatalog
- ImageCatalog.My.MyApplication
-
-
- WindowsForms
- 3.5
-
-
- v4.7.2
- true
- My Project\app.manifest
-
-
- SAK
- SAK
- SAK
- SAK
-
-
- http://localhost/ImageCatalog/
- true
- Web
- true
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.8.0.%2a
- false
- true
-
-
- bin\
- ImageCatalog.xml
- 285212672
-
-
-
-
- true
- true
- true
- false
- false
- false
- false
- 1
- 42016,42017,42018,42019,42032,42353,42354,42355
- full
- AnyCPU
- AllRules.ruleset
- false
-
-
- bin\
- ImageCatalog.xml
- 285212672
-
-
-
-
- false
- true
- false
- true
- false
- false
- false
- 1
- 42016,42017,42018,42019,42032,42353,42354,42355
- none
- AnyCPU
- AllRules.ruleset
- false
-
-
- true
- true
- true
- bin\x64\Debug\
- 285212672
- ImageCatalog.xml
- 1
- 42016,42017,42018,42019,42032,42353,42354,42355
- full
- x64
- AllRules.ruleset
- false
-
-
- true
- bin\x64\Release\
- 285212672
- ImageCatalog.xml
- true
- 1
- 42016,42017,42018,42019,42032,42353,42354,42355
- x64
- AllRules.ruleset
- false
-
-
- true
- true
- true
- bin\x86\Debug\
- 285212672
- ImageCatalog.xml
- 1
- 42016,42017,42018,42019,42032,42353,42354,42355
- full
- x86
- bin\ImageCatalog.exe.CodeAnalysisLog.xml
- true
- GlobalSuppressions.vb
- AllRules.ruleset
- ;F:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
- true
- ;F:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
- true
- false
- false
-
-
- true
- bin\x86\Release\
- 285212672
- ImageCatalog.xml
- true
- 1
- 42016,42017,42018,42019,42032,42353,42354,42355
- x86
- bin\ImageCatalog.exe.CodeAnalysisLog.xml
- true
- GlobalSuppressions.vb
- AllRules.ruleset
- ;F:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets
- true
- ;F:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules
- true
- false
-
-
-
- ..\packages\Ben.Demystifier.0.3.0\lib\net45\Ben.Demystifier.dll
-
-
-
- System
-
-
- ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
-
-
- ..\packages\System.Collections.Immutable.5.0.0\lib\net461\System.Collections.Immutable.dll
-
-
- 3.5
- True
-
-
- System.Data
- True
-
-
- System.Drawing
- True
-
-
- ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
-
-
-
- ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
-
-
- ..\packages\System.Reflection.Metadata.5.0.0\lib\net461\System.Reflection.Metadata.dll
-
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
-
-
- ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
-
-
- System.Windows.Forms
-
-
- System.XML
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Code
-
-
-
-
-
- Code
-
-
- Form
-
-
-
- MainForm.vb
-
-
- Form
-
-
-
- True
- Application.myapp
-
-
- True
- True
- Settings.settings
-
-
-
-
- Code
-
-
- Code
-
-
- Form1.vb
- Designer
-
-
- MainForm.vb
-
-
- MyApplicationCodeGenerator
- Application.Designer.vb
-
-
-
-
-
- My
- SettingsSingleFileGenerator
- Settings.Designer.vb
-
-
-
-
-
- False
- .NET Framework 3.5 SP1 Client Profile
- false
-
-
- False
- .NET Framework 2.0 %28x86%29
- false
-
-
- False
- .NET Framework 3.0 %28x86%29
- false
-
-
- False
- .NET Framework 3.5
- true
-
-
- False
- .NET Framework 3.5 SP1
- false
-
-
- False
- Windows Installer 3.1
- true
-
-
-
-
-
-
-
- {44465926-240d-473f-90b8-786ba4384406}
- CatalogVbLib
-
-
- {aebfe9e3-277c-4a7b-8448-145d1b11998b}
- MaddoShared
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file