From cbf85f6cd1780e57ab46b5a3cf845438adfd2d69 Mon Sep 17 00:00:00 2001
From: XanatosX <10531466+XanatosX@users.noreply.github.com>
Date: Mon, 1 Jan 2024 14:28:53 +0100
Subject: [PATCH 1/4] Add possibility for all modals to be closed with escc Add
 code to precent modal resize by user

---
 src/ModularToolManager/ViewModels/AboutViewModel.cs | 11 +++++++++++
 .../ViewModels/HotkeysViewModel.cs                  | 13 +++++++++++++
 .../ViewModels/ModalWindowViewModel.cs              |  7 +++++++
 src/ModularToolManager/Views/AboutView.axaml        |  1 +
 src/ModularToolManager/Views/AllPluginsView.axaml   |  2 +-
 src/ModularToolManager/Views/HotkeysView.axaml      |  5 ++++-
 src/ModularToolManager/Views/ModalWindow.axaml      |  1 +
 7 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/ModularToolManager/ViewModels/AboutViewModel.cs b/src/ModularToolManager/ViewModels/AboutViewModel.cs
index 27c4656..7b8368d 100644
--- a/src/ModularToolManager/ViewModels/AboutViewModel.cs
+++ b/src/ModularToolManager/ViewModels/AboutViewModel.cs
@@ -1,6 +1,8 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.DependencyInjection;
+using ModularToolManager.Models.Messages;
 using ModularToolManager.Services.IO;
 using ModularToolManagerModel.Services.Dependency;
 using ModularToolManagerModel.Services.IO;
@@ -83,4 +85,13 @@ private void OpenUrl(string url)
     {
         urlOpenerService.OpenUrl(url);
     }
+
+    /// <summary>
+    /// Command to use to close the modal
+    /// </summary>
+    [RelayCommand]
+    private void Abort()
+    {
+        WeakReferenceMessenger.Default.Send(new CloseModalMessage(this));
+    }
 }
diff --git a/src/ModularToolManager/ViewModels/HotkeysViewModel.cs b/src/ModularToolManager/ViewModels/HotkeysViewModel.cs
index f5b21e0..61fb425 100644
--- a/src/ModularToolManager/ViewModels/HotkeysViewModel.cs
+++ b/src/ModularToolManager/ViewModels/HotkeysViewModel.cs
@@ -1,4 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using ModularToolManager.Models.Messages;
 using ModularToolManager.Services.IO;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,4 +30,14 @@ public HotkeysViewModel(GetApplicationInformationService applicationInformationS
 										 .Select(hotkey => new SingleHotkeyViewModel(hotkey))
 										 .ToList();
 	}
+
+	
+    /// <summary>
+    /// Command to use to close the modal
+    /// </summary>
+    [RelayCommand]
+    private void Abort()
+    {
+        WeakReferenceMessenger.Default.Send(new CloseModalMessage(this));
+    }
 }
diff --git a/src/ModularToolManager/ViewModels/ModalWindowViewModel.cs b/src/ModularToolManager/ViewModels/ModalWindowViewModel.cs
index 154f523..2174bd5 100644
--- a/src/ModularToolManager/ViewModels/ModalWindowViewModel.cs
+++ b/src/ModularToolManager/ViewModels/ModalWindowViewModel.cs
@@ -42,6 +42,12 @@ public partial class ModalWindowViewModel : ObservableObject
     /// </summary>
     [ObservableProperty]
     private float materialOpacity;
+    
+    /// <summary>
+    /// Can the modal be resized
+    /// </summary>
+    [ObservableProperty]
+    public bool canResize;
 
     /// <summary>
     /// The service used to switch the application theme
@@ -74,6 +80,7 @@ public ModalWindowViewModel(
         Title = windowInformation.Title;
         ModalContent = windowInformation.modalContent;
         this.themeService = themeService;
+        CanResize = windowInformation.CanResize;
         PathIcon = styleService.GetStyleByName<StreamGeometry>(windowInformation.IconName ?? string.Empty) ?? null;
         if (PathIcon is not null)
         {
diff --git a/src/ModularToolManager/Views/AboutView.axaml b/src/ModularToolManager/Views/AboutView.axaml
index a828fc2..641d314 100644
--- a/src/ModularToolManager/Views/AboutView.axaml
+++ b/src/ModularToolManager/Views/AboutView.axaml
@@ -24,5 +24,6 @@
 			<TextBlock VerticalAlignment="Center" Text="{x:Static p:Resources.RunningWith}"/>
 			<Image Source="/Assets/avalonia-logo.ico"/>
 		</StackPanel>
+		<Button IsVisible="false" Command="{Binding AbortCommand}" HotKey="Escape"/>
 	</StackPanel>
 </UserControl>
diff --git a/src/ModularToolManager/Views/AllPluginsView.axaml b/src/ModularToolManager/Views/AllPluginsView.axaml
index ff3da82..024e6df 100644
--- a/src/ModularToolManager/Views/AllPluginsView.axaml
+++ b/src/ModularToolManager/Views/AllPluginsView.axaml
@@ -25,7 +25,7 @@
 			</Grid>
 		<Grid Grid.Row="1" Margin="0,5,0,0">
 			<StackPanel Orientation="Horizontal">
-				<Button Content="{x:Static p:Resources.DefaultButton_Abort}" Command="{Binding AbortCommand}"/>
+				<Button Content="{x:Static p:Resources.DefaultButton_Abort}" Command="{Binding AbortCommand}" HotKey="Escape"/>
 			</StackPanel>
 		</Grid>
 	</Grid>
diff --git a/src/ModularToolManager/Views/HotkeysView.axaml b/src/ModularToolManager/Views/HotkeysView.axaml
index b75fd70..b350938 100644
--- a/src/ModularToolManager/Views/HotkeysView.axaml
+++ b/src/ModularToolManager/Views/HotkeysView.axaml
@@ -4,5 +4,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="ModularToolManager.Views.HotkeysView">
-	<ItemsControl ItemsSource="{Binding Hotkeys}"/>
+    <StackPanel>
+	    <ItemsControl ItemsSource="{Binding Hotkeys}"/>
+        <Button Command="{Binding AbortCommand}" HotKey="Escape"/>
+    </StackPanel>
 </UserControl>
diff --git a/src/ModularToolManager/Views/ModalWindow.axaml b/src/ModularToolManager/Views/ModalWindow.axaml
index b58b6f8..c60e528 100644
--- a/src/ModularToolManager/Views/ModalWindow.axaml
+++ b/src/ModularToolManager/Views/ModalWindow.axaml
@@ -10,6 +10,7 @@
         ExtendClientAreaToDecorationsHint="True"
 		WindowStartupLocation="CenterOwner"
 		SizeToContent="WidthAndHeight"		
+		CanResize="{Binding CanResize}"
 		MinWidth="300">
 	<Panel>
 		<ExperimentalAcrylicBorder IsHitTestVisible="False">

From 4e53e9ed53bf723fb33652d81f821053ed1d81ff Mon Sep 17 00:00:00 2001
From: XanatosX <10531466+XanatosX@users.noreply.github.com>
Date: Mon, 1 Jan 2024 14:32:25 +0100
Subject: [PATCH 2/4] Add code to prevent user window resize

---
 .../ViewModels/MainWindowViewModel.cs         | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/ModularToolManager/ViewModels/MainWindowViewModel.cs b/src/ModularToolManager/ViewModels/MainWindowViewModel.cs
index 144c8a6..3d5a84a 100644
--- a/src/ModularToolManager/ViewModels/MainWindowViewModel.cs
+++ b/src/ModularToolManager/ViewModels/MainWindowViewModel.cs
@@ -194,7 +194,7 @@ private void UpdateShowInTaskbar()
     [RelayCommand]
     private async Task OpenPlugins()
     {
-        await OpenModalWindow(Properties.Resources.SubMenu_Plugins, Properties.Properties.Icon_new_function, nameof(AllPluginsViewModel));
+        await OpenModalWindow(Properties.Resources.SubMenu_Plugins, Properties.Properties.Icon_new_function, nameof(AllPluginsViewModel), false);
     }
 
     /// <summary>
@@ -204,7 +204,7 @@ private async Task OpenPlugins()
     [RelayCommand]
     private async Task NewFunction()
     {
-        await OpenModalWindow(Properties.Resources.SubMenu_NewFunction, Properties.Properties.Icon_new_function, nameof(AddFunctionViewModel));
+        await OpenModalWindow(Properties.Resources.SubMenu_NewFunction, Properties.Properties.Icon_new_function, nameof(AddFunctionViewModel), false);
         WeakReferenceMessenger.Default.Send(new ReloadFunctionsMessage());
     }
 
@@ -228,7 +228,7 @@ private async Task OpenSettings()
     [RelayCommand]
     private async Task OpenAbout()
     {
-        await OpenModalWindow(Properties.Resources.SubMenu_About, Properties.Properties.Icon_About, nameof(AboutViewModel));
+        await OpenModalWindow(Properties.Resources.SubMenu_About, Properties.Properties.Icon_About, nameof(AboutViewModel), false);
     }
 
     /// <summary>
@@ -238,7 +238,7 @@ private async Task OpenAbout()
     [RelayCommand]
     private async Task OpenHotkey()
     {
-        await OpenModalWindow(Properties.Resources.SubMenu_Hotkeys, Properties.Properties.Icon_Keyboard, nameof(HotkeysViewModel));
+        await OpenModalWindow(Properties.Resources.SubMenu_Hotkeys, Properties.Properties.Icon_Keyboard, nameof(HotkeysViewModel), false);
     }
 
     /// <summary>
@@ -274,6 +274,7 @@ private void SaveOrderMode()
         ToggleOrderMode(false);
     }
 
+    
     /// <summary>
     /// Method to open a modal window
     /// </summary>
@@ -281,20 +282,29 @@ private void SaveOrderMode()
     /// <param name="imagePath">The image path to show</param>
     /// <param name="modalName">The name of the modal to show</param>
     /// <returns></returns>
-    private async Task OpenModalWindow(string title, string imagePath, string modalName)
+    private async Task OpenModalWindow(string title, string imagePath, string modalName, bool canResize )
     {
         var modalContent = viewModelLocator.GetViewModel(modalName);
         if (modalContent is null)
         {
             return;
         }
-        ShowWindowModel modalWindowData = new(title, imagePath, modalContent, WindowStartupLocation.CenterScreen);
+        ShowWindowModel modalWindowData = new(title, imagePath, modalContent, WindowStartupLocation.CenterScreen, canResize);
         if (windowManagementService is not null)
         {
             await windowManagementService.ShowModalWindowAsync(modalWindowData, windowManagementService?.GetMainWindow());
         }
     }
 
+    /// <summary>
+    /// Method to open a modal window
+    /// </summary>
+    /// <param name="title">The title to use</param>
+    /// <param name="imagePath">The image path to show</param>
+    /// <param name="modalName">The name of the modal to show</param>
+    /// <returns></returns>
+    private async Task OpenModalWindow(string title, string imagePath, string modalName) => OpenModalWindow(title, imagePath, modalName, true);
+
     /// <summary>
     /// Method to open a modal window
     /// </summary>

From 32f6634577cb747c376a030c80a6bedac9ab9444 Mon Sep 17 00:00:00 2001
From: XanatosX <10531466+XanatosX@users.noreply.github.com>
Date: Mon, 1 Jan 2024 15:40:17 +0100
Subject: [PATCH 3/4] Fix warnings in code Fix left over code issues with
 avalonia 10 -> 11 upgrade

---
 src/ModularToolManager/App.axaml.cs           |  6 +++++-
 .../Models/ApplicationStyle.cs                |  2 +-
 .../Models/Messages/DeleteFunctionMessage.cs  |  2 +-
 .../Models/Messages/EditFunctionMessage.cs    |  2 +-
 .../Messages/RequestApplicationVisiblity.cs   |  4 ++--
 .../Models/ShowOpenFileDialogModel.cs         |  7 ++++---
 .../Language/ResourceCultureService.cs        |  4 ++--
 .../Services/Styling/DefaultStyleService.cs   |  4 ++++
 .../Services/Ui/WindowManagementService.cs    | 19 ++++++++-----------
 src/ModularToolManager/ViewLocator.cs         |  8 ++++++--
 .../ViewModels/AddFunctionViewModel.cs        | 12 ++++++------
 .../ViewModels/AppViewModel.cs                | 10 ++++------
 .../ViewModels/DependencyViewModel.cs         | 10 +++++-----
 .../ViewModels/FunctionButtonViewModel.cs     | 16 ++++++++--------
 .../ViewModels/IntPluginSettingViewModel.cs   |  8 ++++----
 .../ViewModels/MainWindowViewModel.cs         |  4 ++--
 .../StringPluginSettingViewModel.cs           |  2 +-
 .../Views/MainWindow.axaml.cs                 |  2 +-
 .../Data/FunctionModel.cs                     |  4 +++-
 .../Services/Functions/IFunctionService.cs    |  4 ++--
 .../Services/Language/ILanguageService.cs     |  4 ++--
 21 files changed, 72 insertions(+), 62 deletions(-)

diff --git a/src/ModularToolManager/App.axaml.cs b/src/ModularToolManager/App.axaml.cs
index be2d0f4..d09b000 100644
--- a/src/ModularToolManager/App.axaml.cs
+++ b/src/ModularToolManager/App.axaml.cs
@@ -81,12 +81,16 @@ public override void OnFrameworkInitializationCompleted()
         {
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
+                if (desktop is null || desktop.MainWindow is null)
+                {
+                    return;
+                }
                 desktop.ShutdownMode = Avalonia.Controls.ShutdownMode.OnExplicitShutdown;
                 if (desktop.MainWindow is IDisposable disposable)
                 {
                     disposable.Dispose();
                 }
-                desktop.MainWindow.Close();
+                desktop!.MainWindow!.Close();
                 SetupMainWindow(provider);
                 desktop.MainWindow.Show();
                 desktop.ShutdownMode = Avalonia.Controls.ShutdownMode.OnLastWindowClose;
diff --git a/src/ModularToolManager/Models/ApplicationStyle.cs b/src/ModularToolManager/Models/ApplicationStyle.cs
index 40e0a36..5a649f7 100644
--- a/src/ModularToolManager/Models/ApplicationStyle.cs
+++ b/src/ModularToolManager/Models/ApplicationStyle.cs
@@ -20,7 +20,7 @@ public class ApplicationStyle
     /// Is this a dark or light style variant
     /// </summary>
     [JsonPropertyName("mode")]
-    public ThemeVariant Variant { get; init; }
+    public ThemeVariant? Variant { get; init; }
 
     /// <summary>
     /// The name of the translation key which is getting used for the name
diff --git a/src/ModularToolManager/Models/Messages/DeleteFunctionMessage.cs b/src/ModularToolManager/Models/Messages/DeleteFunctionMessage.cs
index 34a9f38..525a505 100644
--- a/src/ModularToolManager/Models/Messages/DeleteFunctionMessage.cs
+++ b/src/ModularToolManager/Models/Messages/DeleteFunctionMessage.cs
@@ -18,6 +18,6 @@ internal class DeleteFunctionMessage : RequestMessage<bool>
 	/// <param name="functionModel">The function to delete</param>
 	public DeleteFunctionMessage(FunctionModel functionModel)
 	{
-		Identifier = functionModel.UniqueIdentifier;
+		Identifier = functionModel.Id;
 	}
 }
diff --git a/src/ModularToolManager/Models/Messages/EditFunctionMessage.cs b/src/ModularToolManager/Models/Messages/EditFunctionMessage.cs
index 8818b23..15c51bf 100644
--- a/src/ModularToolManager/Models/Messages/EditFunctionMessage.cs
+++ b/src/ModularToolManager/Models/Messages/EditFunctionMessage.cs
@@ -18,6 +18,6 @@ internal class EditFunctionMessage : AsyncRequestMessage<bool>
 	/// <param name="functionModel">The function model to edit</param>
 	public EditFunctionMessage(FunctionModel functionModel)
 	{
-		Identifier = functionModel.UniqueIdentifier;
+		Identifier = functionModel.Id;
 	}
 }
diff --git a/src/ModularToolManager/Models/Messages/RequestApplicationVisiblity.cs b/src/ModularToolManager/Models/Messages/RequestApplicationVisiblity.cs
index 8aed441..bc83686 100644
--- a/src/ModularToolManager/Models/Messages/RequestApplicationVisiblity.cs
+++ b/src/ModularToolManager/Models/Messages/RequestApplicationVisiblity.cs
@@ -3,6 +3,6 @@
 namespace ModularToolManager.Models.Messages;
 
 /// <summary>
-/// Get the current visiblilty for the application
+/// Get the current visibility for the application
 /// </summary>
-internal class RequestApplicationVisiblity : RequestMessage<bool> { }
+internal class RequestApplicationVisibility : RequestMessage<bool> { }
diff --git a/src/ModularToolManager/Models/ShowOpenFileDialogModel.cs b/src/ModularToolManager/Models/ShowOpenFileDialogModel.cs
index a3dff86..c315f60 100644
--- a/src/ModularToolManager/Models/ShowOpenFileDialogModel.cs
+++ b/src/ModularToolManager/Models/ShowOpenFileDialogModel.cs
@@ -1,12 +1,13 @@
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using System.Collections.Generic;
 
 namespace ModularToolManager.Models;
 
 /// <summary>
-/// Record for the openinig a file open dialog
+/// Record for the opening a file open dialog
 /// </summary>
 /// <param name="FileDialogFilters">The filter for the dialog</param>
-/// <param name="InialDirectory">The directory to start in</param>
+/// <param name="InitialDirectory">The directory to start in</param>
 /// <param name="AllowMultipleSelection">Allow selecting multiple files</param>
-public record ShowOpenFileDialogModel(List<FileDialogFilter> FileDialogFilters, string? InialDirectory, bool AllowMultipleSelection);
+public record ShowOpenFileDialogModel(List<FilePickerFileType> FileDialogFilters, string? InitialDirectory, bool AllowMultipleSelection);
diff --git a/src/ModularToolManager/Services/Language/ResourceCultureService.cs b/src/ModularToolManager/Services/Language/ResourceCultureService.cs
index fc7c328..1b7d55e 100644
--- a/src/ModularToolManager/Services/Language/ResourceCultureService.cs
+++ b/src/ModularToolManager/Services/Language/ResourceCultureService.cs
@@ -84,11 +84,11 @@ public List<CultureInfo> GetAvailableCultures()
         }
         logger.LogTrace("Load available cultures from resources");
         string applicationLocation = pathService.GetApplicationExecutableString();
-        string resoureFileName = Path.GetFileNameWithoutExtension(applicationLocation) + ".resources.dll";
+        string resourceFileName = Path.GetFileNameWithoutExtension(applicationLocation) + ".resources.dll";
         DirectoryInfo? rootDirectory = pathService.GetApplicationPath();
         availableCultures = rootDirectory?.GetDirectories()
                                          .Where(dir => CultureInfo.GetCultures(CultureTypes.AllCultures).Any(culture => culture.Name == dir.Name))
-                                         .Where(dir => File.Exists(Path.Combine(dir.FullName, resoureFileName)))
+                                         .Where(dir => File.Exists(Path.Combine(dir.FullName, resourceFileName)))
                                          .Select(dir => CultureInfo.GetCultureInfo(dir.Name))
                                          .ToList() ?? new();
         if (!availableCultures.Contains(CultureInfo.GetCultureInfo(Properties.Properties.FallbackLanguage)))
diff --git a/src/ModularToolManager/Services/Styling/DefaultStyleService.cs b/src/ModularToolManager/Services/Styling/DefaultStyleService.cs
index 976c9ae..abfd2d7 100644
--- a/src/ModularToolManager/Services/Styling/DefaultStyleService.cs
+++ b/src/ModularToolManager/Services/Styling/DefaultStyleService.cs
@@ -39,6 +39,10 @@ public IEnumerable<Style> GetAllStylesWithinResource(IStyle? style)
     /// <inheritdoc/>
     public IEnumerable<IStyle> GetCurrentAppIncludeStyles()
     {
+        if (App.Current is null)
+        {
+            return Enumerable.Empty<IStyle>();
+        }
         var styles = App.Current.Styles.Where(style => style.GetType() == typeof(Styles)).ToList(); ;
         var types = styles.Select(style => style.GetType());
         return App.Current?.Styles.Where(style => style.GetType() == typeof(Styles)) ?? Enumerable.Empty<IStyle>();
diff --git a/src/ModularToolManager/Services/Ui/WindowManagementService.cs b/src/ModularToolManager/Services/Ui/WindowManagementService.cs
index d338858..94a12fe 100644
--- a/src/ModularToolManager/Services/Ui/WindowManagementService.cs
+++ b/src/ModularToolManager/Services/Ui/WindowManagementService.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Platform.Storage;
 using Microsoft.Extensions.Logging;
 using ModularToolManager.Models;
 using ModularToolManager.Services.Settings;
@@ -50,7 +51,7 @@ internal class WindowManagementService : IWindowManagementService
     private readonly IDependencyResolverService dependencyResolverService;
 
     /// <summary>
-    /// Create a new isntance of this class
+    /// Create a new instance of this class
     /// </summary>
     /// <param name="loggingService">The logging service to use</param>
     public WindowManagementService(
@@ -143,17 +144,13 @@ public async Task ShowModalWindowAsync(ShowWindowModel modalData, Window? parent
     /// <inheritdoc/>
     public async Task<string[]> ShowOpenFileDialogAsync(ShowOpenFileDialogModel fileDialogModel, Window parent)
     {
-        OpenFileDialog openFileDialog = new OpenFileDialog
-        {
+        IStorageFolder? initialDirectory = await parent.StorageProvider.TryGetFolderFromPathAsync(fileDialogModel.InitialDirectory ?? string.Empty);
+        var files = await parent.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions() {
             AllowMultiple = fileDialogModel.AllowMultipleSelection,
-            Filters = fileDialogModel.FileDialogFilters.ToList(),
-        };
-        if (!string.IsNullOrEmpty(fileDialogModel.InialDirectory))
-        {
-            openFileDialog.Directory = fileDialogModel.InialDirectory;
-        }
-        string[] files = await openFileDialog.ShowAsync(parent) ?? Array.Empty<string>();
-        return files;
+            FileTypeFilter = fileDialogModel.FileDialogFilters.ToList(),
+            SuggestedStartLocation = initialDirectory
+        });
+        return files.Select(file => file.Path.LocalPath).ToArray();
     }
 
     /// <inheritdoc/>
diff --git a/src/ModularToolManager/ViewLocator.cs b/src/ModularToolManager/ViewLocator.cs
index 78a6980..099bec8 100644
--- a/src/ModularToolManager/ViewLocator.cs
+++ b/src/ModularToolManager/ViewLocator.cs
@@ -26,8 +26,12 @@ public ViewLocator(IDependencyResolverService dependencyResolverService)
         }
 
         /// <inheritdoc/>
-        public Control Build(object data)
+        public Control Build(object? data)
         {
+            if (data is null)
+            {
+                return new TextBlock { Text = "Request data was null" };
+            }
             var name = data.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);
 
@@ -43,7 +47,7 @@ public Control Build(object data)
         }
 
         /// <inheritdoc/>
-        public bool Match(object data)
+        public bool Match(object? data)
         {
             return data is ObservableObject;
         }
diff --git a/src/ModularToolManager/ViewModels/AddFunctionViewModel.cs b/src/ModularToolManager/ViewModels/AddFunctionViewModel.cs
index aa532d7..8f4d190 100644
--- a/src/ModularToolManager/ViewModels/AddFunctionViewModel.cs
+++ b/src/ModularToolManager/ViewModels/AddFunctionViewModel.cs
@@ -1,4 +1,5 @@
 using Avalonia.Controls;
+using Avalonia.Platform.Storage;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
@@ -53,7 +54,7 @@ internal partial class AddFunctionViewModel : ObservableValidator
     /// <summary>
     /// Service to use for opening windows or modals
     /// </summary>
-    private readonly IWindowManagementService windowManagmentService;
+    private readonly IWindowManagementService windowManagementService;
 
     /// <summary>
     /// The settings service to use
@@ -145,7 +146,7 @@ public AddFunctionViewModel(IPluginService pluginService,
         this.pluginService = pluginService;
         this.functionService = functionService;
         this.functionSettingsService = functionSettingsService;
-        this.windowManagmentService = windowManagmentService;
+        this.windowManagementService = windowManagmentService;
         this.settingsService = settingsService;
         this.pluginSettingView = pluginSettingView;
 
@@ -334,17 +335,16 @@ private bool CanExecuteOk()
     [RelayCommand(CanExecute = nameof(CanOpenFunctionPath))]
     private async Task OpenFunctionPath()
     {
-        var fileDialogs = SelectedFunctionPlugin?.Plugin?.GetAllowedFileEndings().Select(fileEnding => new FileDialogFilter
+        var fileDialogs = SelectedFunctionPlugin?.Plugin?.GetAllowedFileEndings().Select(fileEnding => new FilePickerFileType(fileEnding.Name)
         {
-            Extensions = new List<string> { fileEnding.Extension },
-            Name = fileEnding.Name
+            Patterns = new List<string> { $"*.{fileEnding.Extension}" },
         }).ToList();
         if (fileDialogs is null)
         {
             return;
         }
         ShowOpenFileDialogModel openConfig = new ShowOpenFileDialogModel(fileDialogs, null, false);
-        var files = await windowManagmentService.ShowOpenFileDialogAsync(openConfig);
+        var files = await windowManagementService.ShowOpenFileDialogAsync(openConfig);
         string file = files.FirstOrDefault(string.Empty);
         if (string.IsNullOrEmpty(file))
         {
diff --git a/src/ModularToolManager/ViewModels/AppViewModel.cs b/src/ModularToolManager/ViewModels/AppViewModel.cs
index a171f16..e1b1a79 100644
--- a/src/ModularToolManager/ViewModels/AppViewModel.cs
+++ b/src/ModularToolManager/ViewModels/AppViewModel.cs
@@ -6,8 +6,6 @@
 using ModularToolManager.Models.Messages;
 using ModularToolManager.Services.Settings;
 using ModularToolManager.Services.Ui;
-using Serilog;
-using System;
 using System.Windows.Input;
 
 namespace ModularToolManager.ViewModels;
@@ -38,7 +36,7 @@ public partial class AppViewModel : ObservableObject
     private readonly ILogger<AppViewModel> logger;
 
     /// <summary>
-    /// The service to use for loading and swichting a theme
+    /// The service to use for loading and switching a theme
     /// </summary>
     private readonly IThemeService themeService;
 
@@ -69,10 +67,10 @@ public AppViewModel(ILogger<AppViewModel> logger, IThemeService themeService, IS
         {
             if (numberOfOpenModalWindows > 0)
             {
-                logger.LogWarning($"Tried to minimize app while {numberOfOpenModalWindows} where opend");
+                logger.LogWarning($"Tried to minimize app while {numberOfOpenModalWindows} where opened");
                 return;
             }
-            var response = WeakReferenceMessenger.Default.Send(new RequestApplicationVisiblity());
+            var response = WeakReferenceMessenger.Default.Send(new RequestApplicationVisibility());
             bool toggleMode = response.HasReceivedResponse ? response.Response : false;
             WeakReferenceMessenger.Default.Send(new ToggleApplicationVisibilityMessage(toggleMode));
         });
@@ -82,7 +80,7 @@ public AppViewModel(ILogger<AppViewModel> logger, IThemeService themeService, IS
     private void SwitchTheme(int themeId)
     {
         var theme = themeService.GetStyleById(themeId);
-        if (theme is null)
+        if (theme is null || theme.Variant is null)
         {
             return;
         }
diff --git a/src/ModularToolManager/ViewModels/DependencyViewModel.cs b/src/ModularToolManager/ViewModels/DependencyViewModel.cs
index 431b060..6cf6250 100644
--- a/src/ModularToolManager/ViewModels/DependencyViewModel.cs
+++ b/src/ModularToolManager/ViewModels/DependencyViewModel.cs
@@ -31,17 +31,17 @@ internal partial class DependencyViewModel : ObservableObject
 	/// <summary>
 	/// The name of the dependency
 	/// </summary>
-	public string? Name => dependency?.Name;
+	public string? Name => Dependency?.Name;
 
 	/// <summary>
 	/// The version of the dependency
 	/// </summary>
-	public string? Version => dependency?.Version;
+	public string? Version => Dependency?.Version;
 
 	/// <summary>
 	/// The url to the project of the dependency
 	/// </summary>
-	public string? ProjectUrl => dependency?.ProjectUrl;
+	public string? ProjectUrl => Dependency?.ProjectUrl;
 
 	/// <summary>
 	/// Is the project url set
@@ -51,7 +51,7 @@ internal partial class DependencyViewModel : ObservableObject
 	/// <summary>
 	/// The url to the license of the dependency
 	/// </summary>
-	public string? LicenseUrl => dependency?.LicenseUrl;
+	public string? LicenseUrl => Dependency?.LicenseUrl;
 
 	/// <summary>
 	/// is the license for the dependency set
@@ -62,7 +62,7 @@ internal partial class DependencyViewModel : ObservableObject
 	/// <summary>
 	/// Create a new instance of this class
 	/// </summary>
-	/// <param name="dependency">The depencency to show</param>
+	/// <param name="dependency">The dependency to show</param>
 	/// <param name="urlOpenerService">The service used to open the url</param>
 	public DependencyViewModel(DependencyModel dependency, IUrlOpenerService urlOpenerService)
 	{
diff --git a/src/ModularToolManager/ViewModels/FunctionButtonViewModel.cs b/src/ModularToolManager/ViewModels/FunctionButtonViewModel.cs
index 4623f48..a240d18 100644
--- a/src/ModularToolManager/ViewModels/FunctionButtonViewModel.cs
+++ b/src/ModularToolManager/ViewModels/FunctionButtonViewModel.cs
@@ -50,7 +50,7 @@ public partial class FunctionButtonViewModel : ObservableObject
     /// <summary>
     /// The identifier for this function button
     /// </summary>
-    public string Identifier => FunctionModel?.UniqueIdentifier ?? string.Empty;
+    public string Identifier => FunctionModel?.Id ?? string.Empty;
 
     /// <summary>
     /// The display name of the function
@@ -128,7 +128,7 @@ public void SetFunctionModel(FunctionModel functionModel)
     }
 
     /// <summary>
-    /// Command to exetute the current function
+    /// Command to execute the current function
     /// </summary>
     /// <returns>A empty task to await until execution is complete</returns>
     [RelayCommand(CanExecute = nameof(CanExecuteFunction))]
@@ -184,13 +184,13 @@ private void CheckIfCanExecute()
         bool extensionMatching = false;
         if (pathIsAvailable)
         {
-            var info = new FileInfo(FunctionModel.Path);
+            var info = new FileInfo(FunctionModel!.Path);
             extensionMatching = FunctionModel.Plugin.GetAllowedFileEndings().Any(ending => ending.Extension == info.Extension.Replace(".", string.Empty));
         }
 
 
         CanExecute = pathIsAvailable && extensionMatching && pluginAvailable;
-        Description = CanExecute ? FunctionModel.Description : Properties.Resources.FunctionButton_Method_Error;
+        Description = CanExecute ? FunctionModel!.Description : Properties.Resources.FunctionButton_Method_Error;
     }
 
     /// <summary>
@@ -266,14 +266,14 @@ private void UpdatePluginSetting(IFunctionPlugin? plugin, SettingModel loadedPlu
     /// <summary>
     /// Command to edit the current function
     /// </summary>
-    /// <returns>A waitable task</returns>
+    /// <returns>A awaitable task</returns>
     [RelayCommand(CanExecute = nameof(CanEditOrDeleteFunction))]
     private async Task EditFunction()
     {
         bool result = false;
         try
         {
-            result = await WeakReferenceMessenger.Default.Send(new EditFunctionMessage(functionModel!));
+            result = await WeakReferenceMessenger.Default.Send(new EditFunctionMessage(FunctionModel!));
         }
         catch (System.Exception e)
         {
@@ -288,7 +288,7 @@ private async Task EditFunction()
     private void DeleteFunction()
     {
         IsActive = false;
-        WeakReferenceMessenger.Default.Send(new DeleteFunctionMessage(functionModel!));
+        WeakReferenceMessenger.Default.Send(new DeleteFunctionMessage(FunctionModel!));
     }
 
     /// <summary>
@@ -301,7 +301,7 @@ private bool CanEditOrDeleteFunction()
     }
 
     /// <summary>
-    /// Deconstructore to ensure message unsubscribe
+    /// Deconstructor to ensure message unsubscribe
     /// </summary>
     ~FunctionButtonViewModel()
     {
diff --git a/src/ModularToolManager/ViewModels/IntPluginSettingViewModel.cs b/src/ModularToolManager/ViewModels/IntPluginSettingViewModel.cs
index 16cf878..eba70ff 100644
--- a/src/ModularToolManager/ViewModels/IntPluginSettingViewModel.cs
+++ b/src/ModularToolManager/ViewModels/IntPluginSettingViewModel.cs
@@ -14,7 +14,7 @@ internal partial class IntPluginSettingViewModel : PluginSettingBaseViewModel
     /// </summary>
     [ObservableProperty]
     [Range(int.MinValue, int.MaxValue)]
-    private int? intergerNumber;
+    private int? integerNumber;
 
     /// <summary>
     /// Create a new instance of this class
@@ -22,13 +22,13 @@ internal partial class IntPluginSettingViewModel : PluginSettingBaseViewModel
     /// <param name="settingModel">The setting model to get the data from</param>
     public IntPluginSettingViewModel(SettingModel settingModel) : base(settingModel)
     {
-        IntergerNumber = settingModel.GetData<int>();
+        IntegerNumber = settingModel.GetData<int>();
     }
 
     /// <inheritdoc/>
     public override SettingModel GetSettingsModel()
     {
-        storedModel.SetValue(IntergerNumber);
+        storedModel.SetValue(IntegerNumber);
         return storedModel;
     }
 
@@ -37,7 +37,7 @@ public override void UpdateValue(object? newData)
     {
         if (newData is int)
         {
-            intergerNumber = (int)newData;
+            IntegerNumber = (int)newData;
         }
     }
 }
diff --git a/src/ModularToolManager/ViewModels/MainWindowViewModel.cs b/src/ModularToolManager/ViewModels/MainWindowViewModel.cs
index 3d5a84a..304b752 100644
--- a/src/ModularToolManager/ViewModels/MainWindowViewModel.cs
+++ b/src/ModularToolManager/ViewModels/MainWindowViewModel.cs
@@ -93,7 +93,7 @@ public partial class MainWindowViewModel : ObservableObject, IDisposable
     public ICommand SelectLanguageCommand { get; }
 
     /// <summary>
-    /// Command to execture for bug reporting
+    /// Command to execute for bug reporting
     /// </summary>
     public ICommand ReportBugCommand { get; }
 
@@ -303,7 +303,7 @@ private async Task OpenModalWindow(string title, string imagePath, string modalN
     /// <param name="imagePath">The image path to show</param>
     /// <param name="modalName">The name of the modal to show</param>
     /// <returns></returns>
-    private async Task OpenModalWindow(string title, string imagePath, string modalName) => OpenModalWindow(title, imagePath, modalName, true);
+    private async Task OpenModalWindow(string title, string imagePath, string modalName) => await OpenModalWindow(title, imagePath, modalName, true);
 
     /// <summary>
     /// Method to open a modal window
diff --git a/src/ModularToolManager/ViewModels/StringPluginSettingViewModel.cs b/src/ModularToolManager/ViewModels/StringPluginSettingViewModel.cs
index 9afa308..88830ae 100644
--- a/src/ModularToolManager/ViewModels/StringPluginSettingViewModel.cs
+++ b/src/ModularToolManager/ViewModels/StringPluginSettingViewModel.cs
@@ -32,7 +32,7 @@ public override void UpdateValue(object? newData)
     {
         if (newData is string)
         {
-            settingText = (string)newData;
+            SettingText = (string)newData;
         }
     }
 }
diff --git a/src/ModularToolManager/Views/MainWindow.axaml.cs b/src/ModularToolManager/Views/MainWindow.axaml.cs
index 68d4f16..793de76 100644
--- a/src/ModularToolManager/Views/MainWindow.axaml.cs
+++ b/src/ModularToolManager/Views/MainWindow.axaml.cs
@@ -84,7 +84,7 @@ public MainWindow(IWindowManagementService? modalService, ISettingsService? sett
                 Topmost = false;
             }
         });
-        WeakReferenceMessenger.Default.Register<RequestApplicationVisiblity>(this, (_, e) =>
+        WeakReferenceMessenger.Default.Register<RequestApplicationVisibility>(this, (_, e) =>
         {
             if (!e.HasReceivedResponse)
             {
diff --git a/src/ModularToolManagerModel/Data/FunctionModel.cs b/src/ModularToolManagerModel/Data/FunctionModel.cs
index b6c85a1..e902654 100644
--- a/src/ModularToolManagerModel/Data/FunctionModel.cs
+++ b/src/ModularToolManagerModel/Data/FunctionModel.cs
@@ -41,7 +41,7 @@ public class FunctionModel : IRepositoryDataSet<string>
         public string Path { get; set; }
 
         /// <summary>
-        /// The parameters of the function to use for the excecution
+        /// The parameters of the function to use for the execution
         /// </summary>
         public string Parameters { get; set; }
 
@@ -60,6 +60,7 @@ public class FunctionModel : IRepositoryDataSet<string>
         /// </summary>
         public FunctionModel() : this(string.Empty, null, string.Empty, string.Empty, int.MaxValue)
         {
+            Settings = new List<SettingModel>();
         }
 
         /// <summary>
@@ -79,6 +80,7 @@ public FunctionModel(string displayName, IFunctionPlugin? plugin, string path, s
             Path = path;
             Parameters = parameters;
             SortOrder = sortOrder;
+            Settings = new List<SettingModel>();
         }
 
         /// <summary>
diff --git a/src/ModularToolManagerModel/Services/Functions/IFunctionService.cs b/src/ModularToolManagerModel/Services/Functions/IFunctionService.cs
index f417f95..539bcb0 100644
--- a/src/ModularToolManagerModel/Services/Functions/IFunctionService.cs
+++ b/src/ModularToolManagerModel/Services/Functions/IFunctionService.cs
@@ -3,7 +3,7 @@
 namespace ModularToolManagerModel.Services.Functions
 {
     /// <summary>
-    /// Service to load, save and manage functionhs
+    /// Service to load, save and manage functions
     /// </summary>
     public interface IFunctionService
     {
@@ -44,7 +44,7 @@ public interface IFunctionService
         /// Delete a function from the pool
         /// </summary>
         /// <param name="function">The function to delete</param>
-        void DeleteFunction(FunctionModel function) => DeleteFunction(function.UniqueIdentifier);
+        void DeleteFunction(FunctionModel function) => DeleteFunction(function.Id);
 
         /// <summary>
         /// Delete a function from the pool
diff --git a/src/ModularToolManagerModel/Services/Language/ILanguageService.cs b/src/ModularToolManagerModel/Services/Language/ILanguageService.cs
index 7b289d9..da026ce 100644
--- a/src/ModularToolManagerModel/Services/Language/ILanguageService.cs
+++ b/src/ModularToolManagerModel/Services/Language/ILanguageService.cs
@@ -30,14 +30,14 @@ public interface ILanguageService
     /// <summary>
     /// Check if the provided culture is a valid one
     /// </summary>
-    /// <param name="culture">The culutre to check if it is valid</param>
+    /// <param name="culture">The culture to check if it is valid</param>
     /// <returns>True if the provided culture is valid</returns>
     bool ValidLanguage(CultureInfo culture);
 
     /// <summary>
     /// Check if the provided culture is a valid one
     /// </summary>
-    /// <param name="culture">The culutre to check if it is valid</param>
+    /// <param name="culture">The culture to check if it is valid</param>
     /// <returns>True if the provided culture is valid</returns>
     void ValidLanguage(CultureInfoModel newCulture) => ValidLanguage(newCulture.Culture);
 

From 7a1d9d38ad37f421a30da40649767d649505697b Mon Sep 17 00:00:00 2001
From: XanatosX <10531466+XanatosX@users.noreply.github.com>
Date: Mon, 1 Jan 2024 16:02:45 +0100
Subject: [PATCH 4/4] Add documents to explain a function Add documents to add
 a new function

---
 docs/user/add-new-function.md   | 51 +++++++++++++++++++++++++++++++++
 docs/user/user-manual.md        |  4 +++
 docs/user/what-is-a-function.md | 15 ++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 docs/user/add-new-function.md
 create mode 100644 docs/user/what-is-a-function.md

diff --git a/docs/user/add-new-function.md b/docs/user/add-new-function.md
new file mode 100644
index 0000000..518b67a
--- /dev/null
+++ b/docs/user/add-new-function.md
@@ -0,0 +1,51 @@
+# Add a new function
+
+This documentation will tell you on how to add a new function to the application. If you are unsure what a function is check out the [what is a function][what-is-a-function] documentation.
+
+To add a new function click on `File->New Function` while being in the main window. This will open up the add function screen
+
+![add-a-function]
+
+Provide display name for the function, this will be shown on the button. The name needs to be 5 - 25 chars. If you want add an description, this will be shown as a tooltip if you hover over the button later on.
+
+![select-plugin]
+
+Select the plugin to start the application or binary. Checkout the [plugin overview][available-plugins] for more information.
+
+![additional-settings]
+
+Select the setting specific for this function. For more information about the [setting scope][setting-scope] check the documentation.
+
+If required enter any function parameters, those are arguments which are getting parsed to the script or application.
+
+Select the path to the script or application to start. To do so press the `...` next to the text field
+
+![final-function]
+
+If everything is entered as expected, press the `Ok` button. If the button is still grayed out something is wrong or could not be found.
+
+The function will now be shown in the main view like this.
+
+![function-in-tool]
+
+Showing the tooltip on hover
+
+![function-in-tool-tooltip]
+
+Press the button you created to start the tool. If this is not working you will need to check the log file for further information.
+
+## User Manual
+
+Go back to the [user manual][back]
+
+[back]: user-manual.md
+[what-is-a-function]: ./what-is-a-function.md
+[available-plugins]: ./plugin-overview.md
+[setting-scope]: ./scope-of-a-setting.md
+[main-window]: https://i.imgur.com/oswayay.png
+[add-a-function]: https://i.imgur.com/mr3Folx.png
+[select-plugin]: https://i.imgur.com/8ITUSA3.png
+[additional-settings]: https://i.imgur.com/O8va6Gd.png
+[final-function]: https://i.imgur.com/lmiIzjX.png
+[function-in-tool]: https://i.imgur.com/60cHafm.png
+[function-in-tool-tooltip]: https://i.imgur.com/8lUHaiU.png
diff --git a/docs/user/user-manual.md b/docs/user/user-manual.md
index 4456604..e578b25 100644
--- a/docs/user/user-manual.md
+++ b/docs/user/user-manual.md
@@ -5,11 +5,15 @@ The manual of the application. This page does list all the things you as a user
 - [[1] Installation][installation]
 - [[2] Plugin Overview][plugin-overview]
 - [[3] Languages][language]
+- [[4] Add a function][add-a-function]
+  - [[4a] What is a function][what-is-a-function]
 - [[4] Scope of a Setting][scope-of-a-setting]
 - [[5] Hotkeys][hotkey-overview]
 
 [installation]: ./installation.md
 [language]: ./languages.md
 [scope-of-a-setting]: ./scope-of-a-setting.md
+[add-a-function]: ./add-new-function.md
+[what-is-a-function]: ./what-is-a-function.md
 [plugin-overview]: ./plugin-overview.md
 [hotkey-overview]: ./hotkey-overview.md
\ No newline at end of file
diff --git a/docs/user/what-is-a-function.md b/docs/user/what-is-a-function.md
new file mode 100644
index 0000000..3f85253
--- /dev/null
+++ b/docs/user/what-is-a-function.md
@@ -0,0 +1,15 @@
+# What is a function
+
+The term function in connection with the `Modular Tool Manager` is a set of data required to start a specific application or script. Those functions are displayed as buttons on the main window
+
+![main-window]
+
+`My test function` is a function which will start a specific application or script.
+
+## User Manual
+
+Go back to the [user manual][back]
+
+[back]: user-manual.md
+
+[main-window]: https://i.imgur.com/oswayay.png
\ No newline at end of file