From effe49db09e0edc423bf622a86927690450b4e9b Mon Sep 17 00:00:00 2001
From: Jimmy White <jimmyeao@users.noreply.github.com>
Date: Sat, 29 Jul 2023 15:44:44 +0100
Subject: [PATCH 1/5] Added custom Dialog boxes and auto fine Elite Executable

---
 CustomDialog.xaml                        |  36 +++
 CustomDialog.xaml.cs                     |  43 ++++
 Elite Dangerous Addon Launcher V2.csproj |   4 +-
 ErrorBox.xaml                            |  35 +++
 ErrorBox.xaml.cs                         |  43 ++++
 MainWindow.xaml.cs                       | 288 ++++++++++++++++++++++-
 SearchProgressWindow.xaml                |  27 +++
 SearchProgressWindow.xaml.cs             |  29 +++
 8 files changed, 492 insertions(+), 13 deletions(-)
 create mode 100644 CustomDialog.xaml
 create mode 100644 CustomDialog.xaml.cs
 create mode 100644 ErrorBox.xaml
 create mode 100644 ErrorBox.xaml.cs
 create mode 100644 SearchProgressWindow.xaml
 create mode 100644 SearchProgressWindow.xaml.cs

diff --git a/CustomDialog.xaml b/CustomDialog.xaml
new file mode 100644
index 0000000..a02b661
--- /dev/null
+++ b/CustomDialog.xaml
@@ -0,0 +1,36 @@
+<Window x:Class="Elite_Dangerous_Addon_Launcer_V2.CustomDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:Elite_Dangerous_Addon_Launcer_V2"
+    Title="Custom Dialog" 
+    Width="400" 
+    Height="200"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+    TextElement.FontWeight="Regular"
+    TextElement.FontSize="13"
+    TextOptions.TextFormattingMode="Ideal" 
+    TextOptions.TextRenderingMode="Auto"        
+    Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{DynamicResource MaterialDesignFont}">
+
+    <materialDesign:Card>
+        <Border Padding="20">
+            <Grid>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock x:Name="MessageTextBlock" Grid.Row="0" Text="Message" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap" />
+
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
+                    <Button x:Name="YesButton" Content="Yes" Click="YesButton_Click" Margin="10"/>
+                    <Button x:Name="NoButton" Content="No" Click="NoButton_Click" Margin="10"/>
+                </StackPanel>
+
+            </Grid>
+        </Border>
+    </materialDesign:Card>
+</Window>
diff --git a/CustomDialog.xaml.cs b/CustomDialog.xaml.cs
new file mode 100644
index 0000000..ee90a16
--- /dev/null
+++ b/CustomDialog.xaml.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Elite_Dangerous_Addon_Launcer_V2
+{
+    /// <summary>
+    /// Interaction logic for CustomDialog.xaml
+    /// </summary>
+    public partial class CustomDialog : Window
+    {
+        public MessageBoxResult Result { get; set; }
+
+        public CustomDialog(string message)
+        {
+            InitializeComponent();
+            MessageTextBlock.Text = message;
+        }
+
+        private void YesButton_Click(object sender, RoutedEventArgs e)
+        {
+            Result = MessageBoxResult.Yes;
+            this.Close();
+        }
+
+        private void NoButton_Click(object sender, RoutedEventArgs e)
+        {
+            Result = MessageBoxResult.No;
+            this.Close();
+        }
+    }
+
+}
diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj
index c185ba9..a77a470 100644
--- a/Elite Dangerous Addon Launcher V2.csproj	
+++ b/Elite Dangerous Addon Launcher V2.csproj	
@@ -6,8 +6,8 @@
     <RootNamespace>Elite_Dangerous_Addon_Launcer_V2</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <AssemblyVersion>1.1.2.253</AssemblyVersion>
-    <FileVersion>1.1.2.253</FileVersion>
+    <AssemblyVersion>1.1.2.294</AssemblyVersion>
+    <FileVersion>1.1.2.294</FileVersion>
     <ApplicationIcon>elite-dangerous-icon.ico</ApplicationIcon>
     <PackageIcon>app.png</PackageIcon>
     <PackageProjectUrl>https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2</PackageProjectUrl>
diff --git a/ErrorBox.xaml b/ErrorBox.xaml
new file mode 100644
index 0000000..ad4e20d
--- /dev/null
+++ b/ErrorBox.xaml
@@ -0,0 +1,35 @@
+<Window x:Class="Elite_Dangerous_Addon_Launcer_V2.ErrorDialog"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:Elite_Dangerous_Addon_Launcer_V2"
+    Title="Custom Error" 
+    Width="400" 
+    Height="200"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+    TextElement.FontWeight="Regular"
+    TextElement.FontSize="13"
+    TextOptions.TextFormattingMode="Ideal" 
+    TextOptions.TextRenderingMode="Auto"        
+    Background="{DynamicResource MaterialDesignPaper}"
+    FontFamily="{DynamicResource MaterialDesignFont}">
+
+    <materialDesign:Card>
+        <Border Padding="20">
+            <Grid>
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <TextBlock x:Name="MessageTextBlock" Grid.Row="0" Text="Message" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap" />
+
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
+                    <Button x:Name="YesButton" Content="Ok" Click="YesButton_Click" Margin="10"/>
+                </StackPanel>
+
+            </Grid>
+        </Border>
+    </materialDesign:Card>
+</Window>
diff --git a/ErrorBox.xaml.cs b/ErrorBox.xaml.cs
new file mode 100644
index 0000000..dbe107e
--- /dev/null
+++ b/ErrorBox.xaml.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Elite_Dangerous_Addon_Launcer_V2
+{
+    /// <summary>
+    /// Interaction logic for CustomDialog.xaml
+    /// </summary>
+    public partial class ErrorDialog : Window
+    {
+        public MessageBoxResult Result { get; set; }
+
+        public ErrorDialog(string message)
+        {
+            InitializeComponent();
+            MessageTextBlock.Text = message;
+        }
+
+        private void YesButton_Click(object sender, RoutedEventArgs e)
+        {
+            Result = MessageBoxResult.Yes;
+            this.Close();
+        }
+
+        private void NoButton_Click(object sender, RoutedEventArgs e)
+        {
+            Result = MessageBoxResult.No;
+            this.Close();
+        }
+    }
+
+}
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 175c4d8..da6c80b 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using Microsoft.Win32;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
@@ -13,6 +14,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using Newtonsoft.Json.Linq;
 
 namespace Elite_Dangerous_Addon_Launcer_V2
 
@@ -86,6 +88,7 @@ public MainWindow(string profileName = null)
             // Set the data context to AppState instance
             this.DataContext = AppState.Instance;
             CloseAllAppsCheckbox.IsChecked = Properties.Settings.Default.CloseAllAppsOnExit;
+            
         }
 
         protected override void OnClosed(EventArgs e)
@@ -142,6 +145,7 @@ public void DragOver(IDropInfo dropInfo)
             {
                 dropInfo.DropTargetAdorner = DropTargetAdorners.Highlight;
                 dropInfo.Effects = DragDropEffects.Move;
+                SaveProfilesAsync();
             }
         }
 
@@ -300,18 +304,48 @@ private void Bt_AddProfile_Click_1(object sender, RoutedEventArgs e)
             }
         }
 
-        private void Bt_RemoveProfile_Click_1(object sender, RoutedEventArgs e)
+        private async void Bt_RemoveProfile_Click_1(object sender, RoutedEventArgs e)
         {
             Profile profileToRemove = (Profile)Cb_Profiles.SelectedItem;
 
             if (profileToRemove != null)
             {
-                AppState.Instance.Profiles.Remove(profileToRemove);
-                _ = SaveProfilesAsync();
-                UpdateDataGrid();
+                CustomDialog dialog = new CustomDialog("Are you sure you want to delete this profile?");
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                dialog.ShowDialog();
+
+                if (dialog.Result == MessageBoxResult.Yes)
+                {
+                    AppState.Instance.Profiles.Remove(profileToRemove);
+
+                    // Check if another profile can be selected
+                    if (AppState.Instance.Profiles.Any())
+                    {
+                        // Select the next profile, or the first one if no next profile exists
+                        AppState.Instance.CurrentProfile = AppState.Instance.Profiles.FirstOrDefault(p => p != profileToRemove) ?? AppState.Instance.Profiles.First();
+
+                        // If no profile is set as default, set the current profile as the default
+                        if (!AppState.Instance.Profiles.Any(p => p.IsDefault))
+                        {
+                            AppState.Instance.CurrentProfile.IsDefault = true;
+                            DefaultCheckBox.IsChecked = true;
+                        }
+                    }
+                    else
+                    {
+                        // No profiles left, so set CurrentProfile to null
+                        AppState.Instance.CurrentProfile = null;
+                    }
+
+                    _ = SaveProfilesAsync();
+                    UpdateDataGrid();
+                }
             }
         }
 
+
+
         private void Btn_Edit_Click(object sender, RoutedEventArgs e)
         {
             Button button = (Button)sender;
@@ -352,6 +386,7 @@ private void Cb_Profiles_SelectionChanged(object sender, SelectionChangedEventAr
                 {
                     UpdateDataGrid();
                     DefaultCheckBox.IsChecked = selectedProfile.IsDefault;
+                    CheckEdLaunchInProfile();
                 }
             }
         }
@@ -413,13 +448,20 @@ private void DeleteButton_Click(object sender, RoutedEventArgs e)
         {
             // get the button that raised the event
             var button = (Button)sender;
+            CustomDialog dialog = new CustomDialog("Are you sure?");
+            dialog.Owner = Application.Current.MainWindow;
+            dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            dialog.ShowDialog();
 
-            // retrieve the item associated with this button
-            var appToDelete = (MyApp)button.DataContext;
+            if (dialog.Result == MessageBoxResult.Yes)
+            {
+                // retrieve the item associated with this button
+                var appToDelete = (MyApp)button.DataContext;
 
-            // remove the item from the collection
-            AppState.Instance.CurrentProfile.Apps.Remove(appToDelete);
-            _ = SaveProfilesAsync();
+                // remove the item from the collection
+                AppState.Instance.CurrentProfile.Apps.Remove(appToDelete);
+                _ = SaveProfilesAsync();
+            }
         }
 
         private void LaunchApp(MyApp app) // function to launch enabled applications
@@ -527,6 +569,7 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
                     }
                 }
             }
+            CheckEdLaunchInProfile();
         }
 
 
@@ -744,13 +787,17 @@ private void Bt_CopyProfile_Click(object sender, RoutedEventArgs e)
                                 Apps = new ObservableCollection<MyApp>(currentProfile.Apps)
                             };
                             AppState.Instance.Profiles.Add(newProfile);
+                            AppState.Instance.CurrentProfile = newProfile; // switch to the new profile
                             _ = SaveProfilesAsync();
-
+                            Cb_Profiles.SelectedItem = newProfile; // update combobox selected item
                             isUnique = true;
                         }
                         else
                         {
-                            MessageBox.Show("Profile name must be unique. Please enter a different name.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                            ErrorDialog errdialog = new ErrorDialog("Profile name must be unique. Please enter a different name.");
+                            errdialog.Owner = Application.Current.MainWindow;
+                            errdialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                            errdialog.ShowDialog();
                         }
                     }
                     else
@@ -761,6 +808,7 @@ private void Bt_CopyProfile_Click(object sender, RoutedEventArgs e)
             }
         }
 
+
         private void Bt_RenameProfile_Click(object sender, RoutedEventArgs e)
         {
             var currentProfile = AppState.Instance.CurrentProfile;
@@ -838,6 +886,224 @@ private void CloseAllAppsCheckbox_Unchecked_1(object sender, RoutedEventArgs e)
             Properties.Settings.Default.CloseAllAppsOnExit = false;
             Properties.Settings.Default.Save();
         }
+        private async void CheckEdLaunchInProfile()
+        {
+            // Get the current profile
+            var currentProfile = AppState.Instance.CurrentProfile;
+            if(currentProfile == null)
+            {
+                return;
+            }
+            // Check if edlaunch.exe exists in the current profile
+            if (!currentProfile.Apps.Any(a => a.ExeName.Equals("edlaunch.exe", StringComparison.OrdinalIgnoreCase)))
+            {
+                // edlaunch.exe does not exist in the current profile
+                // Prompt the user with a dialog offering to scan their computer for it
+                CustomDialog dialog = new CustomDialog("Elite Dangerous does not exist in the current profile. Would you like to scan your computer for it?");
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                dialog.ShowDialog();
+
+           
+
+                // If the user clicked Yes, call the method that scans the computer for edlaunch.exe
+                if (dialog.Result == MessageBoxResult.Yes)
+                {
+                    var EdLuanchPaths = await ScanComputerForEdLaunch(); // Note the "await" keyword here
+                    if (EdLuanchPaths.Count > 0)
+                    {
+                        // Add edlaunch.exe to the current profile
+                        var edlaunch = new MyApp
+                        {
+                            Name = "Elite Dangerous",
+                            ExeName = "edlaunch.exe",
+                            Path = Path.GetDirectoryName(EdLuanchPaths[0]),
+                            IsEnabled = true,
+                            Order = 0
+                        };
+                        currentProfile.Apps.Add(edlaunch);
+                        await SaveProfilesAsync(); // You can also "await" here since SaveProfilesAsync is probably asynchronous
+                    }
+                    else
+                    {
+                        MessageBox.Show(
+                            "edlaunch.exe was not found on your computer. Please add it manually.",
+                            "edlaunch.exe Not Found",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Error
+                        );
+                    }
+                }
+            }
+        }
+
+        public static async Task<List<string>> ScanComputerForEdLaunch()
+        {
+            List<string> foundPaths = new List<string>();
+            string targetFolder = "Elite Dangerous";
+            string targetFile = "edlaunch.exe";
+            var tokenSource = new CancellationTokenSource();
+            var token = tokenSource.Token;
+
+            SearchProgressWindow progressWindow = new SearchProgressWindow();
+
+            progressWindow.Owner = Application.Current.MainWindow;
+            progressWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            progressWindow.Closing += (s, e) => tokenSource.Cancel();
+
+            progressWindow.Show(); // Show the window before starting the task
+
+            await Task.Run(() =>
+            {
+                try
+                {
+                    foreach (DriveInfo drive in DriveInfo.GetDrives())
+                    {
+                        if (token.IsCancellationRequested)
+                            break;
+
+                        if (drive.DriveType == DriveType.Fixed)
+                        {
+                            try
+                            {
+                                string driveRoot = drive.RootDirectory.ToString();
+                                if (TraverseDirectories(driveRoot, targetFolder, targetFile, foundPaths, progressWindow, 7, token))
+                                {
+                                    break;
+                                }
+                            }
+                            catch (UnauthorizedAccessException)
+                            {
+                                // If we don't have access to the directory, skip it
+                            }
+                            catch (IOException)
+                            {
+                                // If another error occurs, skip it
+                            }
+                        }
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    // If operation is canceled, return
+                    return;
+                }
+            }, token);
+
+            if (progressWindow.IsVisible)
+                progressWindow.Close();
+
+            return foundPaths;
+        }
+
+
+        public static bool TraverseDirectories(string root, string targetFolder, string targetFile, List<string> foundPaths, SearchProgressWindow window, int maxDepth, CancellationToken token, int currentDepth = 0)
+        {
+            // Array of directories to exclude
+            string[] excludeDirs = {
+                "windows",
+                "users",
+                "OneDriveTemp",
+                "ProgramData",
+                "$Recycle.Bin",
+                "OneDrive"
+            };
+
+            if (token.IsCancellationRequested)
+                return false;
+
+            // Make sure not to exceed maximum depth
+            if (currentDepth > maxDepth) return false;
+
+            foreach (string dir in Directory.GetDirectories(root))
+            {
+                // Check for excluded directories
+                bool isExcluded = false;
+                foreach (string excludeDir in excludeDirs)
+                {
+                    if (dir.ToLower().Contains(excludeDir.ToLower()))
+                    {
+                        isExcluded = true;
+                        break;
+                    }
+                }
+
+                if (isExcluded || token.IsCancellationRequested)
+                {
+                    continue;
+                }
+
+                try
+                {
+                    string dirName = new DirectoryInfo(dir).Name;
+
+                    if (dirName.Equals(targetFolder, StringComparison.OrdinalIgnoreCase))
+                    {
+                        // The folder has the name we're looking for, now we just need to check if the file is there
+                        foreach (string file in Directory.GetFiles(dir))
+                        {
+                            if (Path.GetFileName(file).Equals(targetFile, StringComparison.OrdinalIgnoreCase))
+                            {
+                                foundPaths.Add(file);
+                                return true; // File has been found
+                            }
+                        }
+                    }
+
+                    // Trim the path for display in the UI
+                    string trimmedPath = dir;
+                    if (dir.Count(f => f == '\\') > 2)
+                    {
+                        var parts = dir.Split('\\');
+                        trimmedPath = string.Join("\\", parts.Take(3)) + "\\...";
+                    }
+
+                    window.Dispatcher.Invoke(() =>
+                    {
+                        window.searchStatusTextBlock.Text = $"Checking: {trimmedPath}";
+                    });
+
+                    // Move on to the next level
+                    bool found = TraverseDirectories(dir, targetFolder, targetFile, foundPaths, window, maxDepth, token, currentDepth + 1);
+
+                    if (found)
+                    {
+                        return true; // File has been found in a subdirectory, so we stop the search
+                    }
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    // If we don't have access to the directory, skip it
+                }
+                catch (IOException)
+                {
+                    // If another error occurs, skip it
+                }
+            }
+
+            return false; // If we get to this point, we haven't found the file
+        }
+
+
+
+        private static string ShortenPath(string fullPath, int maxParts)
+        {
+            var parts = fullPath.Split(Path.DirectorySeparatorChar);
+            return string.Join(Path.DirectorySeparatorChar, parts.Take(maxParts));
+        }
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     }
 }
\ No newline at end of file
diff --git a/SearchProgressWindow.xaml b/SearchProgressWindow.xaml
new file mode 100644
index 0000000..f52faea
--- /dev/null
+++ b/SearchProgressWindow.xaml
@@ -0,0 +1,27 @@
+<Window x:Class="Elite_Dangerous_Addon_Launcer_V2.SearchProgressWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:Elite_Dangerous_Addon_Launcer_V2"
+        Title="Searching for Elite Dangerous"
+        Height="150"
+        Width="400"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="13"
+        TextOptions.TextFormattingMode="Ideal" 
+        TextOptions.TextRenderingMode="Auto"        
+        Background="{DynamicResource MaterialDesignPaper}"
+        FontFamily="{DynamicResource MaterialDesignFont}">
+
+    <Grid>
+        <TextBlock Name="searchStatusTextBlock"
+               Text="Searching for Elite Dangerous..."
+               HorizontalAlignment="Center"
+               VerticalAlignment="Top"
+               Margin="10" />
+
+        <ProgressBar IsIndeterminate="True"
+                 Margin="20" />
+    </Grid>
+</Window>
diff --git a/SearchProgressWindow.xaml.cs b/SearchProgressWindow.xaml.cs
new file mode 100644
index 0000000..4a72282
--- /dev/null
+++ b/SearchProgressWindow.xaml.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Elite_Dangerous_Addon_Launcer_V2
+{
+    /// <summary>
+    /// Interaction logic for SearchProgressWindow.xaml
+    /// </summary>
+    public partial class SearchProgressWindow : Window
+    {
+        public SearchProgressWindow()
+        {
+            InitializeComponent();
+        }
+
+
+    }
+}

From 9cacba349286ae288c6dc3ebd06cb6fc8e1d814b Mon Sep 17 00:00:00 2001
From: Jimmy White <jimmyeao@users.noreply.github.com>
Date: Sat, 29 Jul 2023 15:55:52 +0100
Subject: [PATCH 2/5] added import and export function

---
 Elite Dangerous Addon Launcher V2.csproj |   4 +-
 MainWindow.xaml                          |   3 +
 MainWindow.xaml.cs                       | 458 ++++++++++++-----------
 3 files changed, 245 insertions(+), 220 deletions(-)

diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj
index a77a470..8e9e823 100644
--- a/Elite Dangerous Addon Launcher V2.csproj	
+++ b/Elite Dangerous Addon Launcher V2.csproj	
@@ -6,8 +6,8 @@
     <RootNamespace>Elite_Dangerous_Addon_Launcer_V2</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <AssemblyVersion>1.1.2.294</AssemblyVersion>
-    <FileVersion>1.1.2.294</FileVersion>
+    <AssemblyVersion>1.1.2.297</AssemblyVersion>
+    <FileVersion>1.1.2.297</FileVersion>
     <ApplicationIcon>elite-dangerous-icon.ico</ApplicationIcon>
     <PackageIcon>app.png</PackageIcon>
     <PackageProjectUrl>https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2</PackageProjectUrl>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 5a27c8f..f100e7c 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -147,6 +147,9 @@ Click="Bt_RenameProfile_Click" Style="{DynamicResource MaterialDesignRaisedButto
                    Margin="10,0" 
                    Height="128" 
                    VerticalAlignment="Top" />
+            <Button x:Name="Btn_Launch_Copy" Content="Import" Click="ImportProfiles" Style="{DynamicResource MaterialDesignRaisedButton}" Margin="0,115,0,201" Grid.Column="1" />
+            <Button x:Name="Btn_Launch_Copy1" Content="Export" Click="ExportProfiles" Style="{DynamicResource MaterialDesignRaisedButton}" Margin="0,158,0,158" Grid.Column="1" />
+
         </Grid>
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index da6c80b..77308db 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using GongSolutions.Wpf.DragDrop;
+using Microsoft.Win32;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -6,7 +7,6 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
-using Microsoft.Win32;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
@@ -14,7 +14,6 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using Newtonsoft.Json.Linq;
 
 namespace Elite_Dangerous_Addon_Launcer_V2
 
@@ -63,7 +62,7 @@ public string ApplicationVersion
         public MainWindow(string profileName = null)
         {
             InitializeComponent();
-            
+
             if (!string.IsNullOrEmpty(profileName))
             {
                 // Use the profileName to load the appropriate profile
@@ -88,7 +87,6 @@ public MainWindow(string profileName = null)
             // Set the data context to AppState instance
             this.DataContext = AppState.Instance;
             CloseAllAppsCheckbox.IsChecked = Properties.Settings.Default.CloseAllAppsOnExit;
-            
         }
 
         protected override void OnClosed(EventArgs e)
@@ -99,7 +97,6 @@ protected override void OnClosed(EventArgs e)
             Properties.Settings.Default.MainWindowLocation = new System.Drawing.Point((int)this.Left, (int)this.Top);
             Properties.Settings.Default.Save();
         }
-      
 
         protected override void OnContentRendered(EventArgs e)
         {
@@ -197,7 +194,6 @@ public async Task LoadProfilesAsync(string profileName = null)
             }
         }
 
-
         public async Task SaveProfilesAsync()
         {
             // Serialize the profiles into a JSON string
@@ -265,7 +261,6 @@ private void Bt_AddApp_Click_1(object sender, RoutedEventArgs e)
         {
             if (AppState.Instance.CurrentProfile != null)
             {
-
                 AddApp addAppWindow = new AddApp()
                 {
                     MainPageReference = this,
@@ -290,7 +285,6 @@ private void Bt_AddProfile_Click_1(object sender, RoutedEventArgs e)
             window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             window.Owner = this;  // Or replace 'this' with reference to the main window
 
-
             if (window.ShowDialog() == true)
             {
                 string profileName = window.ProfileName;
@@ -344,8 +338,6 @@ private async void Bt_RemoveProfile_Click_1(object sender, RoutedEventArgs e)
             }
         }
 
-
-
         private void Btn_Edit_Click(object sender, RoutedEventArgs e)
         {
             Button button = (Button)sender;
@@ -356,7 +348,7 @@ private void Btn_Edit_Click(object sender, RoutedEventArgs e)
                 AddApp addAppWindow = new AddApp();
                 addAppWindow.AppToEdit = appToEdit; // Set the AppToEdit to the app you want to edit
                 addAppWindow.MainPageReference = this; // Assuming this is done from MainWindow, else replace 'this' with the instance of MainWindow
-                 // Set the owner and startup location
+                                                       // Set the owner and startup location
                 addAppWindow.Owner = this; // Or replace 'this' with reference to the main window
                 addAppWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
                 addAppWindow.ShowDialog();
@@ -572,8 +564,6 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
             CheckEdLaunchInProfile();
         }
 
-
-
         private void ModifyTheme(Uri newThemeUri)
         {
             var appResources = Application.Current.Resources;
@@ -736,207 +726,6 @@ private void UpdateStatus(string status)
 
         #endregion Private Methods
 
-        private void AddonDataGrid_ContextMenuOpening(object sender, ContextMenuEventArgs e)
-        {
-            var dataGrid = (DataGrid)sender;
-            var originalSource = (DependencyObject)e.OriginalSource;
-
-            // Find the DataGridRow in the visual tree
-            while ((originalSource != null) && !(originalSource is DataGridRow))
-            {
-                originalSource = VisualTreeHelper.GetParent(originalSource);
-            }
-
-            // If we found a DataGridRow
-            if (originalSource is DataGridRow dataGridRow)
-            {
-                // Get the MyApp instance from the row
-                var app = (MyApp)dataGridRow.DataContext;
-                AppState.Instance.CurrentApp = app;
-            }
-        }
-
-        private void Bt_CopyProfile_Click(object sender, RoutedEventArgs e)
-        {
-            var currentProfile = AppState.Instance.CurrentProfile;
-
-            if (currentProfile != null)
-            {
-                bool isUnique = false;
-                string newName = currentProfile.Name;
-
-                while (!isUnique)
-                {
-                    var dialog = new RenameProfileDialog(newName);
-                    dialog.Title = "Copy Profile";
-                    // Center the dialog within the owner window
-                    dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                    dialog.Owner = this;  // Or replace 'this' with reference to the main window
-
-                    if (dialog.ShowDialog() == true)
-                    {
-                        newName = dialog.NewName;
-
-                        // Check if the profile name is unique
-                        if (!AppState.Instance.Profiles.Any(p => p.Name == newName))
-                        {
-                            // Change profile name
-                            var newProfile = new Profile
-                            {
-                                Name = newName,
-                                Apps = new ObservableCollection<MyApp>(currentProfile.Apps)
-                            };
-                            AppState.Instance.Profiles.Add(newProfile);
-                            AppState.Instance.CurrentProfile = newProfile; // switch to the new profile
-                            _ = SaveProfilesAsync();
-                            Cb_Profiles.SelectedItem = newProfile; // update combobox selected item
-                            isUnique = true;
-                        }
-                        else
-                        {
-                            ErrorDialog errdialog = new ErrorDialog("Profile name must be unique. Please enter a different name.");
-                            errdialog.Owner = Application.Current.MainWindow;
-                            errdialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                            errdialog.ShowDialog();
-                        }
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-
-        private void Bt_RenameProfile_Click(object sender, RoutedEventArgs e)
-        {
-            var currentProfile = AppState.Instance.CurrentProfile;
-
-            if (currentProfile != null)
-            {
-                // Show rename dialog and get result
-                var dialog = new RenameProfileDialog(currentProfile.Name);
-                // Center the dialog within the owner window
-                dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                dialog.Owner = this;  // Or replace 'this' with reference to the main window
-
-                if (dialog.ShowDialog() == true)
-                {
-                    // Change profile name
-                    currentProfile.Name = dialog.NewName;
-                    // need to save the settings
-                    _ = SaveProfilesAsync();
-                }
-            }
-        }
-
-        private DataGridRow GetDataGridRow(MenuItem menuItem)
-        {
-            DependencyObject obj = menuItem;
-            while (obj != null && obj.GetType() != typeof(DataGridRow))
-            {
-                obj = VisualTreeHelper.GetParent(obj);
-            }
-            return obj as DataGridRow;
-        }
-
-        private void ProfileMenuItem_Click(object sender, RoutedEventArgs e)
-        {
-            var menuItem = (MenuItem)e.OriginalSource;
-            var profile = (Profile)menuItem.DataContext;
-            var app = AppState.Instance.CurrentApp;
-            Debug.WriteLine($"Clicked on profile: {profile.Name}");
-
-            // Now you can use profile and app. Make sure to create a copy of app, not to use the
-            // same instance in multiple profiles.
-            if (app != null)
-            {
-                Debug.WriteLine($"Clicked on app: {app.Name}");
-                var appCopy = new MyApp
-                {
-                    Args = app.Args,
-                    ExeName = app.ExeName,
-                    InstallationURL = app.InstallationURL,
-                    IsEnabled = app.IsEnabled,
-                    Name = app.Name,
-                    Order = app.Order,
-                    Path = app.Path,
-                    WebAppURL = app.WebAppURL
-                };
-
-                // Add the app to the profile
-                profile.Apps.Add(appCopy);
-                _ = SaveProfilesAsync();
-            }
-            else
-            {
-                Debug.WriteLine("No app selected");
-            }
-        }
-
-        private void CloseAllAppsCheckbox_Checked_1(object sender, RoutedEventArgs e)
-        {
-            Properties.Settings.Default.CloseAllAppsOnExit = true;
-            Properties.Settings.Default.Save();
-        }
-
-        private void CloseAllAppsCheckbox_Unchecked_1(object sender, RoutedEventArgs e)
-        {
-            Properties.Settings.Default.CloseAllAppsOnExit = false;
-            Properties.Settings.Default.Save();
-        }
-        private async void CheckEdLaunchInProfile()
-        {
-            // Get the current profile
-            var currentProfile = AppState.Instance.CurrentProfile;
-            if(currentProfile == null)
-            {
-                return;
-            }
-            // Check if edlaunch.exe exists in the current profile
-            if (!currentProfile.Apps.Any(a => a.ExeName.Equals("edlaunch.exe", StringComparison.OrdinalIgnoreCase)))
-            {
-                // edlaunch.exe does not exist in the current profile
-                // Prompt the user with a dialog offering to scan their computer for it
-                CustomDialog dialog = new CustomDialog("Elite Dangerous does not exist in the current profile. Would you like to scan your computer for it?");
-                dialog.Owner = Application.Current.MainWindow;
-                dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-                dialog.ShowDialog();
-
-           
-
-                // If the user clicked Yes, call the method that scans the computer for edlaunch.exe
-                if (dialog.Result == MessageBoxResult.Yes)
-                {
-                    var EdLuanchPaths = await ScanComputerForEdLaunch(); // Note the "await" keyword here
-                    if (EdLuanchPaths.Count > 0)
-                    {
-                        // Add edlaunch.exe to the current profile
-                        var edlaunch = new MyApp
-                        {
-                            Name = "Elite Dangerous",
-                            ExeName = "edlaunch.exe",
-                            Path = Path.GetDirectoryName(EdLuanchPaths[0]),
-                            IsEnabled = true,
-                            Order = 0
-                        };
-                        currentProfile.Apps.Add(edlaunch);
-                        await SaveProfilesAsync(); // You can also "await" here since SaveProfilesAsync is probably asynchronous
-                    }
-                    else
-                    {
-                        MessageBox.Show(
-                            "edlaunch.exe was not found on your computer. Please add it manually.",
-                            "edlaunch.exe Not Found",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Error
-                        );
-                    }
-                }
-            }
-        }
-
         public static async Task<List<string>> ScanComputerForEdLaunch()
         {
             List<string> foundPaths = new List<string>();
@@ -996,7 +785,6 @@ await Task.Run(() =>
             return foundPaths;
         }
 
-
         public static bool TraverseDirectories(string root, string targetFolder, string targetFile, List<string> foundPaths, SearchProgressWindow window, int maxDepth, CancellationToken token, int currentDepth = 0)
         {
             // Array of directories to exclude
@@ -1039,7 +827,8 @@ public static bool TraverseDirectories(string root, string targetFolder, string
 
                     if (dirName.Equals(targetFolder, StringComparison.OrdinalIgnoreCase))
                     {
-                        // The folder has the name we're looking for, now we just need to check if the file is there
+                        // The folder has the name we're looking for, now we just need to check if
+                        // the file is there
                         foreach (string file in Directory.GetFiles(dir))
                         {
                             if (Path.GetFileName(file).Equals(targetFile, StringComparison.OrdinalIgnoreCase))
@@ -1084,25 +873,258 @@ public static bool TraverseDirectories(string root, string targetFolder, string
             return false; // If we get to this point, we haven't found the file
         }
 
-
-
         private static string ShortenPath(string fullPath, int maxParts)
         {
             var parts = fullPath.Split(Path.DirectorySeparatorChar);
             return string.Join(Path.DirectorySeparatorChar, parts.Take(maxParts));
         }
 
+        private void AddonDataGrid_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+        {
+            var dataGrid = (DataGrid)sender;
+            var originalSource = (DependencyObject)e.OriginalSource;
+
+            // Find the DataGridRow in the visual tree
+            while ((originalSource != null) && !(originalSource is DataGridRow))
+            {
+                originalSource = VisualTreeHelper.GetParent(originalSource);
+            }
+
+            // If we found a DataGridRow
+            if (originalSource is DataGridRow dataGridRow)
+            {
+                // Get the MyApp instance from the row
+                var app = (MyApp)dataGridRow.DataContext;
+                AppState.Instance.CurrentApp = app;
+            }
+        }
+
+        private void Bt_CopyProfile_Click(object sender, RoutedEventArgs e)
+        {
+            var currentProfile = AppState.Instance.CurrentProfile;
+
+            if (currentProfile != null)
+            {
+                bool isUnique = false;
+                string newName = currentProfile.Name;
+
+                while (!isUnique)
+                {
+                    var dialog = new RenameProfileDialog(newName);
+                    dialog.Title = "Copy Profile";
+                    // Center the dialog within the owner window
+                    dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                    dialog.Owner = this;  // Or replace 'this' with reference to the main window
+
+                    if (dialog.ShowDialog() == true)
+                    {
+                        newName = dialog.NewName;
+
+                        // Check if the profile name is unique
+                        if (!AppState.Instance.Profiles.Any(p => p.Name == newName))
+                        {
+                            // Change profile name
+                            var newProfile = new Profile
+                            {
+                                Name = newName,
+                                Apps = new ObservableCollection<MyApp>(currentProfile.Apps)
+                            };
+                            AppState.Instance.Profiles.Add(newProfile);
+                            AppState.Instance.CurrentProfile = newProfile; // switch to the new profile
+                            _ = SaveProfilesAsync();
+                            Cb_Profiles.SelectedItem = newProfile; // update combobox selected item
+                            isUnique = true;
+                        }
+                        else
+                        {
+                            ErrorDialog errdialog = new ErrorDialog("Profile name must be unique. Please enter a different name.");
+                            errdialog.Owner = Application.Current.MainWindow;
+                            errdialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                            errdialog.ShowDialog();
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void Bt_RenameProfile_Click(object sender, RoutedEventArgs e)
+        {
+            var currentProfile = AppState.Instance.CurrentProfile;
+
+            if (currentProfile != null)
+            {
+                // Show rename dialog and get result
+                var dialog = new RenameProfileDialog(currentProfile.Name);
+                // Center the dialog within the owner window
+                dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                dialog.Owner = this;  // Or replace 'this' with reference to the main window
+
+                if (dialog.ShowDialog() == true)
+                {
+                    // Change profile name
+                    currentProfile.Name = dialog.NewName;
+                    // need to save the settings
+                    _ = SaveProfilesAsync();
+                }
+            }
+        }
+
+        private async void CheckEdLaunchInProfile()
+        {
+            // Get the current profile
+            var currentProfile = AppState.Instance.CurrentProfile;
+            if (currentProfile == null)
+            {
+                return;
+            }
+            // Check if edlaunch.exe exists in the current profile
+            if (!currentProfile.Apps.Any(a => a.ExeName.Equals("edlaunch.exe", StringComparison.OrdinalIgnoreCase)))
+            {
+                // edlaunch.exe does not exist in the current profile Prompt the user with a dialog
+                // offering to scan their computer for it
+                CustomDialog dialog = new CustomDialog("Elite Dangerous does not exist in the current profile. Would you like to scan your computer for it?");
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                dialog.ShowDialog();
+
+                // If the user clicked Yes, call the method that scans the computer for edlaunch.exe
+                if (dialog.Result == MessageBoxResult.Yes)
+                {
+                    var EdLuanchPaths = await ScanComputerForEdLaunch(); // Note the "await" keyword here
+                    if (EdLuanchPaths.Count > 0)
+                    {
+                        // Add edlaunch.exe to the current profile
+                        var edlaunch = new MyApp
+                        {
+                            Name = "Elite Dangerous",
+                            ExeName = "edlaunch.exe",
+                            Path = Path.GetDirectoryName(EdLuanchPaths[0]),
+                            IsEnabled = true,
+                            Order = 0
+                        };
+                        currentProfile.Apps.Add(edlaunch);
+                        await SaveProfilesAsync(); // You can also "await" here since SaveProfilesAsync is probably asynchronous
+                    }
+                    else
+                    {
+                        MessageBox.Show(
+                            "edlaunch.exe was not found on your computer. Please add it manually.",
+                            "edlaunch.exe Not Found",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Error
+                        );
+                    }
+                }
+            }
+        }
+
+        private void CloseAllAppsCheckbox_Checked_1(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.CloseAllAppsOnExit = true;
+            Properties.Settings.Default.Save();
+        }
 
+        private void CloseAllAppsCheckbox_Unchecked_1(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.CloseAllAppsOnExit = false;
+            Properties.Settings.Default.Save();
+        }
 
+        private DataGridRow GetDataGridRow(MenuItem menuItem)
+        {
+            DependencyObject obj = menuItem;
+            while (obj != null && obj.GetType() != typeof(DataGridRow))
+            {
+                obj = VisualTreeHelper.GetParent(obj);
+            }
+            return obj as DataGridRow;
+        }
 
+        private void ProfileMenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            var menuItem = (MenuItem)e.OriginalSource;
+            var profile = (Profile)menuItem.DataContext;
+            var app = AppState.Instance.CurrentApp;
+            Debug.WriteLine($"Clicked on profile: {profile.Name}");
 
+            // Now you can use profile and app. Make sure to create a copy of app, not to use the
+            // same instance in multiple profiles.
+            if (app != null)
+            {
+                Debug.WriteLine($"Clicked on app: {app.Name}");
+                var appCopy = new MyApp
+                {
+                    Args = app.Args,
+                    ExeName = app.ExeName,
+                    InstallationURL = app.InstallationURL,
+                    IsEnabled = app.IsEnabled,
+                    Name = app.Name,
+                    Order = app.Order,
+                    Path = app.Path,
+                    WebAppURL = app.WebAppURL
+                };
 
+                // Add the app to the profile
+                profile.Apps.Add(appCopy);
+                _ = SaveProfilesAsync();
+            }
+            else
+            {
+                Debug.WriteLine("No app selected");
+            }
+        }
+        private void ExportProfiles(object sender, RoutedEventArgs e)
+        {
+            var saveFileDialog = new SaveFileDialog();
+            saveFileDialog.Filter = "JSON file (*.json)|*.json";
+            saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
 
+            if (saveFileDialog.ShowDialog() == true)
+            {
+                string json = JsonConvert.SerializeObject(AppState.Instance.Profiles);
+                File.WriteAllText(saveFileDialog.FileName, json);
+            }
+        }
+        private async void ImportProfiles(object sender, RoutedEventArgs e)
+        {
+            var openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "JSON file (*.json)|*.json";
+            openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
 
+            if (openFileDialog.ShowDialog() == true)
+            {
+                string json = File.ReadAllText(openFileDialog.FileName);
+                var importedProfiles = JsonConvert.DeserializeObject<List<Profile>>(json);
+                CustomDialog dialog = new CustomDialog("Are you sure you, this will remove all current profiles?");
+                dialog.Owner = Application.Current.MainWindow;
+                dialog.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                dialog.ShowDialog();
 
+                if (dialog.Result == MessageBoxResult.No)
+                {
+                      return;
+                }
+                    // remove current profiles
+                    AppState.Instance.Profiles.Clear();
 
+                // add imported profiles
+                foreach (var profile in importedProfiles)
+                {
+                    AppState.Instance.Profiles.Add(profile);
+                }
 
+                // save the changes
+                _ = SaveProfilesAsync();
 
+                // update the UI
+                UpdateDataGrid();
+                Cb_Profiles.SelectedIndex = 0; // if you want to automatically select the first imported profile
+            }
+        }
 
 
     }

From d98c0d31fb11c6bf9b3f01efbee18eb2633a00da Mon Sep 17 00:00:00 2001
From: Jimmy White <jimmyeao@users.noreply.github.com>
Date: Sat, 29 Jul 2023 16:38:55 +0100
Subject: [PATCH 3/5] fixes to search for elite exe

---
 Elite Dangerous Addon Launcher V2.csproj |  4 ++--
 MainWindow.xaml                          | 25 ++++++++++++------------
 MainWindow.xaml.cs                       | 22 +++++++++++++++++----
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj
index 8e9e823..4f1b347 100644
--- a/Elite Dangerous Addon Launcher V2.csproj	
+++ b/Elite Dangerous Addon Launcher V2.csproj	
@@ -6,8 +6,8 @@
     <RootNamespace>Elite_Dangerous_Addon_Launcer_V2</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <AssemblyVersion>1.1.2.297</AssemblyVersion>
-    <FileVersion>1.1.2.297</FileVersion>
+    <AssemblyVersion>1.1.2.311</AssemblyVersion>
+    <FileVersion>1.1.2.311</FileVersion>
     <ApplicationIcon>elite-dangerous-icon.ico</ApplicationIcon>
     <PackageIcon>app.png</PackageIcon>
     <PackageProjectUrl>https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2</PackageProjectUrl>
diff --git a/MainWindow.xaml b/MainWindow.xaml
index f100e7c..4d033df 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -49,8 +49,6 @@
 
         <StackPanel Grid.Row="0" Orientation="Vertical" Margin="10,10,2,2">
             <StackPanel Orientation="Horizontal">
-                <Button x:Name="Bt_AddProfile" Content="Add Profile" Width="131" 
-                        Click="Bt_AddProfile_Click_1" Style="{DynamicResource MaterialDesignRaisedButton}" />
                 <Button x:Name="Bt_AddApp" Content="Add App" Width="131" Margin="10,0"
                         Click="Bt_AddApp_Click_1" Style="{DynamicResource MaterialDesignRaisedButton}" />
                 <Button Content="Toggle Theme" Click="ToggleThemeButton_Click"
@@ -66,17 +64,22 @@
                 <CheckBox x:Name="DefaultCheckBox" Content="Default"  
                           IsChecked="{Binding IsDefault, Mode=TwoWay}" 
                           Margin="10,0" Height="15" Checked="DefaultCheckbox_Checked" Unchecked="CheckBox_Unchecked" />
+                <Button x:Name="Btn_Launch" Content="Launch" Width="106"
+                        Click="Btn_Launch_Click" Style="{DynamicResource MaterialDesignRaisedButton}" />
             </StackPanel>
 
             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
-                <Button x:Name="Bt_RemoveProfile" Content="Remove Profile" Width="131"
-                        Click="Bt_RemoveProfile_Click_1" Style="{DynamicResource MaterialDesignRaisedButton}" Margin="0,0,10,0" />
-                <Button x:Name="Bt_CopyProfile" Content="Copy Profile" Width="131"
-Click="Bt_CopyProfile_Click" Style="{DynamicResource MaterialDesignRaisedButton}"  Margin="0,0,10,0"/>
-                <Button x:Name="Bt_RenameProfile" Content="Rename Profile" Width="131"
-Click="Bt_RenameProfile_Click" Style="{DynamicResource MaterialDesignRaisedButton}" Margin="0,0,10,0" />
-                <Button x:Name="Btn_Launch" Content="Launch" Width="106"
-                        Click="Btn_Launch_Click" Style="{DynamicResource MaterialDesignRaisedButton}" Margin="0,0,10,0" />
+                <Expander Header="Profiles.." Width="200">
+                    <StackPanel>
+                        <Button x:Name="Bt_AddProfile" Content="Add Profile" Click="Bt_AddProfile_Click_1" Style="{DynamicResource MaterialDesignRaisedButton}" />
+                        <Button x:Name="Bt_RemoveProfile" Content="Remove Profile" Click="Bt_RemoveProfile_Click_1" Style="{DynamicResource MaterialDesignRaisedButton}" />
+                        <Button x:Name="Bt_CopyProfile" Content="Copy Profile" Click="Bt_CopyProfile_Click" Style="{DynamicResource MaterialDesignRaisedButton}" />
+                        <Button x:Name="Bt_RenameProfile" Content="Rename Profile" Click="Bt_RenameProfile_Click" Style="{DynamicResource MaterialDesignRaisedButton}" />
+                        <Button x:Name="Btn_Import" Content="Import" Click="ImportProfiles" Style="{DynamicResource MaterialDesignRaisedButton}" />
+                        <Button x:Name="Btn_Export" Content="Export" Click="ExportProfiles" Style="{DynamicResource MaterialDesignRaisedButton}" />
+                    </StackPanel>
+                </Expander>
+               
                 <CheckBox x:Name="CloseAllAppsCheckbox" Content="Close apps on Exit"
                           DataContext="{x:Static local:AppState.Instance}"
                           IsChecked="{Binding CloseAllApps, Mode=TwoWay}" Checked="CloseAllAppsCheckbox_Checked_1" Unchecked ="CloseAllAppsCheckbox_Unchecked_1"
@@ -147,8 +150,6 @@ Click="Bt_RenameProfile_Click" Style="{DynamicResource MaterialDesignRaisedButto
                    Margin="10,0" 
                    Height="128" 
                    VerticalAlignment="Top" />
-            <Button x:Name="Btn_Launch_Copy" Content="Import" Click="ImportProfiles" Style="{DynamicResource MaterialDesignRaisedButton}" Margin="0,115,0,201" Grid.Column="1" />
-            <Button x:Name="Btn_Launch_Copy1" Content="Export" Click="ExportProfiles" Style="{DynamicResource MaterialDesignRaisedButton}" Margin="0,158,0,158" Grid.Column="1" />
 
         </Grid>
     </Grid>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 77308db..b23c434 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -25,9 +25,9 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         public List<string> processList = new List<string>();
 
         private string _applicationVersion;
-
+        private bool _isChecking = false;
         private string _appVersion;
-
+        private bool _isLoading = true;
         // The row that will be dragged.
         private DataGridRow _rowToDrag;
 
@@ -142,6 +142,7 @@ public void DragOver(IDropInfo dropInfo)
             {
                 dropInfo.DropTargetAdorner = DropTargetAdorners.Highlight;
                 dropInfo.Effects = DragDropEffects.Move;
+              
                 SaveProfilesAsync();
             }
         }
@@ -378,11 +379,17 @@ private void Cb_Profiles_SelectionChanged(object sender, SelectionChangedEventAr
                 {
                     UpdateDataGrid();
                     DefaultCheckBox.IsChecked = selectedProfile.IsDefault;
-                    CheckEdLaunchInProfile();
+                    if (!_isLoading) // Change here
+                    {
+                        _isChecking = true;
+                        CheckEdLaunchInProfile();
+                        _isChecking = false;
+                    }
                 }
             }
         }
 
+
         private void CheckBox_Unchecked(object sender, RoutedEventArgs e)  // this is the checkbox fo r the defaul profile
         {
             var checkBox = (CheckBox)sender;
@@ -546,6 +553,7 @@ private async Task<Settings> LoadSettingsAsync()
 
         private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
+            _isLoading = true;
             await LoadProfilesAsync(App.ProfileName);
             settings = await LoadSettingsAsync();
             isDarkTheme = settings.Theme == "Dark";
@@ -561,7 +569,13 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
                     }
                 }
             }
-            CheckEdLaunchInProfile();
+            _isLoading = false;
+            if (_isChecking == false)
+            {
+                _isChecking = true;
+                CheckEdLaunchInProfile();
+                _isChecking = false;
+            }
         }
 
         private void ModifyTheme(Uri newThemeUri)

From 8c9346ca150ce6d45edba1ee7b15f40566697755 Mon Sep 17 00:00:00 2001
From: Jimmy White <jimmyeao@users.noreply.github.com>
Date: Sat, 29 Jul 2023 17:24:49 +0100
Subject: [PATCH 4/5] Added Elite Dangersous Launch Options

---
 AddApp.xaml                              | 48 +++++++++----------
 AddApp.xaml.cs                           | 60 ++++++++++++++++++++++++
 Elite Dangerous Addon Launcher V2.csproj |  4 +-
 MainWindow.xaml.cs                       |  1 +
 4 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/AddApp.xaml b/AddApp.xaml
index 932e319..b753b82 100644
--- a/AddApp.xaml
+++ b/AddApp.xaml
@@ -4,9 +4,9 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:Elite_Dangerous_Addon_Launcer_V2"
     Title="Add App"
-    Width="521" 
-    Height="273"
-     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    Width="540" 
+    Height="280"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
         TextElement.Foreground="{DynamicResource MaterialDesignBody}"
         TextElement.FontWeight="Regular"
         TextElement.FontSize="13"
@@ -26,47 +26,45 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
 
             <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="170"/>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <Label Grid.Row="0" Grid.Column="0" Content="Application Name" Margin="10,10,0,0"/>
-            <TextBox x:Name="Tb_App_Name" Grid.Row="0" Grid.Column="1" Margin="10,10,0,0" Width="250" HorizontalAlignment="Left"/>
+            <Label Grid.Row="0" Grid.Column="0" Content="Application Name" Margin="10,10,44,0"/>
+            <TextBox x:Name="Tb_App_Name" Grid.Row="0" Grid.Column="1" Margin="10,10,0,0" Width="240" HorizontalAlignment="Left"/>
 
-            <Label Grid.Row="1" Grid.Column="0" Content="Application Path" Margin="10,0,0,0" VerticalAlignment="Center"/>
-            <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal" Margin="10,0,0,0">
-                <TextBox x:Name="Tb_AppPath" Width="250" Margin="0,0,10,0"/>
-                <Button x:Name="Bt_BrowsePath" Content="Browse.." Click="Bt_BrowsePath_Click"/>
-            </StackPanel>
+            <Label Grid.Row="1" Grid.Column="0" Content="Application Path" Margin="10,0,44,0" VerticalAlignment="Center"/>
+            <TextBox x:Name="Tb_AppPath" Grid.Column="1" Margin="10,33,10,0" Grid.RowSpan="2" Width="240"/>
+            <Button x:Name="Bt_BrowsePath" Grid.Row="1" Grid.Column="2" Content="Browse.." Click="Bt_BrowsePath_Click" Width="80" Margin="10,0,0,0"/>
 
-            <Label Grid.Row="2" Grid.Column="0" Content="Application Args" Margin="10,0,0,0"/>
-            <TextBox x:Name="Tb_App_Args" Grid.Row="2" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="250"/>
+            <CheckBox x:Name="CheckBox1" Grid.Row="2" Grid.Column="2" Content="Autorun" Margin="10,10,0,0" HorizontalAlignment="Left" Visibility="Hidden" Checked="CheckBox1_Checked" Unchecked="CheckBox1_Unchecked"/>
+            <CheckBox x:Name="CheckBox2" Grid.Row="3" Grid.Column="2" Content="Autoexit" Margin="10,10,0,0" HorizontalAlignment="Left" Visibility="Hidden" Checked="CheckBox2_Checked" Unchecked="CheckBox2_Unchecked"/>
+            <CheckBox x:Name="CheckBox3" Grid.Row="4" Grid.Column="2" Content="VR" Margin="10,10,0,0" HorizontalAlignment="Left" Visibility="Hidden" Checked="CheckBox3_Checked" Unchecked="CheckBox3_Unchecked"/>
+            <Label Grid.Row="1" Grid.Column="0" Content="Application Args" Margin="10,32,57,0" Grid.RowSpan="2"/>
+            <TextBox x:Name="Tb_App_Args" Grid.Row="2" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="240" TextChanged="Tb_App_Args_TextChanged"/>
 
-            <Label Grid.Row="3" Grid.Column="0" Content="Installation URL" Margin="10,0,0,0"/>
-            <TextBox x:Name="Tb_InstallationURL" Grid.Row="3" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="250"/>
+            <Label Grid.Row="2" Grid.Column="0" Content="Installation URL" Margin="10,28,57,0" Grid.RowSpan="2"/>
+            <TextBox x:Name="Tb_InstallationURL" Grid.Row="3" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="240"/>
 
-            <Label Grid.Row="4" Grid.Column="0" Content="Executable Name" Margin="10,0,0,0"/>
-            <TextBox x:Name="Tb_AppExeName" Grid.Row="4" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="250"/>
+            <Label Grid.Row="3" Grid.Column="0" Content="Executable Name" Margin="10,28,57,23" Grid.RowSpan="3"/>
+            <TextBox x:Name="Tb_AppExeName" Grid.Row="4" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="240" TextChanged="Tb_AppExeName_TextChanged"/>
 
-            <Label Grid.Row="5" Grid.Column="0" Content="WebApp URL" Margin="10,0,0,0"/>
-            <TextBox x:Name="Tb_WebApURL" Grid.Row="5" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="250"/>
+            <Label Grid.Row="5" Grid.Column="0" Content="WebApp URL" Margin="10,0,57,0"/>
+            <TextBox x:Name="Tb_WebApURL" Grid.Row="5" Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" Width="240"/>
 
             <CheckBox x:Name="Cb_Enable" Grid.Row="6" Grid.Column="0" Content="Enable?" Margin="10,10,0,0" HorizontalAlignment="Left" Width="103"/>
 
-            <StackPanel Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center">
+            <StackPanel Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" Orientation="Horizontal" HorizontalAlignment="Center">
                 <Button x:Name="button1" Content="Save.." Click="addApp"/>
                 <Button x:Name="button2" Content="Cancel" Margin="10,0,0,0" Click="cancelButton"/>
             </StackPanel>
 
             <TextBox x:Name="Tb_AppFileToken" Visibility="Collapsed"/>
-
         </Grid>
     </materialDesign:Card>
 </Window>
diff --git a/AddApp.xaml.cs b/AddApp.xaml.cs
index 07436ec..25ffe59 100644
--- a/AddApp.xaml.cs
+++ b/AddApp.xaml.cs
@@ -26,6 +26,21 @@ public AddApp()
 
             this.Loaded += AddApp_Loaded;
         }
+        private void Tb_AppExeName_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (Tb_AppExeName.Text == "edlaunch.exe")
+            {
+                CheckBox1.Visibility = Visibility.Visible;
+                CheckBox2.Visibility = Visibility.Visible;
+                CheckBox3.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                CheckBox1.Visibility = Visibility.Hidden;
+                CheckBox2.Visibility = Visibility.Hidden;
+                CheckBox3.Visibility = Visibility.Hidden;
+            }
+        }
 
         private void AddApp_Loaded(object sender, RoutedEventArgs e)
         {
@@ -55,6 +70,51 @@ private void Bt_BrowsePath_Click(object sender, RoutedEventArgs e)
                 Tb_AppExeName.Text = fileName;
             }
         }
+        private void CheckBox1_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!Tb_App_Args.Text.Contains("/autorun"))
+            {
+                Tb_App_Args.Text += " /autorun";
+            }
+        }
+
+        private void CheckBox1_Unchecked(object sender, RoutedEventArgs e)
+        {
+            Tb_App_Args.Text = Tb_App_Args.Text.Replace(" /autorun", "");
+        }
+
+        private void CheckBox2_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!Tb_App_Args.Text.Contains("/autoquit"))
+            {
+                Tb_App_Args.Text += " /autoquit";
+            }
+        }
+
+        private void CheckBox2_Unchecked(object sender, RoutedEventArgs e)
+        {
+            Tb_App_Args.Text = Tb_App_Args.Text.Replace(" /autoquit", "");
+        }
+
+        private void Tb_App_Args_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            CheckBox1.IsChecked = Tb_App_Args.Text.Contains("/autorun");
+            CheckBox2.IsChecked = Tb_App_Args.Text.Contains("/autoquit");
+            CheckBox3.IsChecked = Tb_App_Args.Text.Contains("/vr");
+        }
+        private void CheckBox3_Unchecked(object sender, RoutedEventArgs e)
+        {
+            Tb_App_Args.Text = Tb_App_Args.Text.Replace(" /vr", "");
+        }
+        private void CheckBox3_Checked(object sender, RoutedEventArgs e)
+        {
+            if (!Tb_App_Args.Text.Contains("/vr"))
+            {
+                Tb_App_Args.Text += " /vr";
+            }
+        }
+
+
 
         private void addApp(object sender, RoutedEventArgs e)
         {
diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj
index 4f1b347..9e0745c 100644
--- a/Elite Dangerous Addon Launcher V2.csproj	
+++ b/Elite Dangerous Addon Launcher V2.csproj	
@@ -6,8 +6,8 @@
     <RootNamespace>Elite_Dangerous_Addon_Launcer_V2</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <AssemblyVersion>1.1.2.311</AssemblyVersion>
-    <FileVersion>1.1.2.311</FileVersion>
+    <AssemblyVersion>1.1.2.329</AssemblyVersion>
+    <FileVersion>1.1.2.329</FileVersion>
     <ApplicationIcon>elite-dangerous-icon.ico</ApplicationIcon>
     <PackageIcon>app.png</PackageIcon>
     <PackageProjectUrl>https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2</PackageProjectUrl>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index b23c434..ab18dcb 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -352,6 +352,7 @@ private void Btn_Edit_Click(object sender, RoutedEventArgs e)
                                                        // Set the owner and startup location
                 addAppWindow.Owner = this; // Or replace 'this' with reference to the main window
                 addAppWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+                addAppWindow.Title = "Edit App";
                 addAppWindow.ShowDialog();
             }
         }

From fa6a8b3217ea8a61cabec8c0f87adb406a462b7f Mon Sep 17 00:00:00 2001
From: Jimmy White <jimmyeao@users.noreply.github.com>
Date: Sat, 29 Jul 2023 17:39:40 +0100
Subject: [PATCH 5/5] added whatsnew function

---
 App.config                               |  3 ++
 Elite Dangerous Addon Launcher V2.csproj |  4 +-
 MainWindow.xaml.cs                       | 61 ++++++++++++++++++++++++
 Properties/Settings.Designer.cs          | 12 +++++
 Properties/Settings.settings             |  3 ++
 WhatsNew.xaml                            | 39 +++++++++++++++
 WhatsNew.xaml.cs                         | 31 ++++++++++++
 7 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 WhatsNew.xaml
 create mode 100644 WhatsNew.xaml.cs

diff --git a/App.config b/App.config
index 58162d8..ceab020 100644
--- a/App.config
+++ b/App.config
@@ -19,6 +19,9 @@
             <setting name="UpdateSettings" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="LastSeenVersion" serializeAs="String">
+                <value />
+            </setting>
         </Elite_Dangerous_Addon_Launcer_V2.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj
index 9e0745c..84137a7 100644
--- a/Elite Dangerous Addon Launcher V2.csproj	
+++ b/Elite Dangerous Addon Launcher V2.csproj	
@@ -6,8 +6,8 @@
     <RootNamespace>Elite_Dangerous_Addon_Launcer_V2</RootNamespace>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <AssemblyVersion>1.1.2.329</AssemblyVersion>
-    <FileVersion>1.1.2.329</FileVersion>
+    <AssemblyVersion>1.1.2.335</AssemblyVersion>
+    <FileVersion>1.1.2.335</FileVersion>
     <ApplicationIcon>elite-dangerous-icon.ico</ApplicationIcon>
     <PackageIcon>app.png</PackageIcon>
     <PackageProjectUrl>https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2</PackageProjectUrl>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ab18dcb..0a74b96 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -13,6 +13,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Documents;
 using System.Windows.Media;
 
 namespace Elite_Dangerous_Addon_Launcer_V2
@@ -356,6 +357,65 @@ private void Btn_Edit_Click(object sender, RoutedEventArgs e)
                 addAppWindow.ShowDialog();
             }
         }
+        public void ShowWhatsNewIfUpdated()
+        {
+            // Get the current assembly version.
+            var assemblyVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+
+            // Get the last seen version from the application settings.
+            var lastSeenVersion = Properties.Settings.Default.LastSeenVersion;
+
+            // If the last seen version is empty (which it will be the first time this method is run)
+            // or if the assembly version is greater than the last seen version, show the what's new dialog.
+            if (string.IsNullOrEmpty(lastSeenVersion) || new Version(lastSeenVersion) < assemblyVersion)
+            {
+                ShowWhatsNew();
+
+                // Update the last seen version in the application settings.
+                Properties.Settings.Default.LastSeenVersion = assemblyVersion.ToString();
+
+                // Save the application settings.
+                Properties.Settings.Default.Save();
+            }
+        }
+
+        public void ShowWhatsNew()
+        {
+            WhatsNewWindow whatsNewWindow = new WhatsNewWindow();
+
+            // Set the text to what's new
+            Paragraph titleParagraph = new Paragraph();
+            titleParagraph.Inlines.Add(new Bold(new Run("New for this version")));
+            whatsNewWindow.WhatsNewText.Document.Blocks.Add(titleParagraph);
+
+            List list = new List();
+
+            ListItem listItem1 = new ListItem(new Paragraph(new Run("Launch Options For Elite")));
+            list.ListItems.Add(listItem1);
+
+            ListItem listItem2 = new ListItem(new Paragraph(new Run("Profile Options for import/export and copy/rename/delete")));
+            list.ListItems.Add(listItem2);
+
+            ListItem listItem3 = new ListItem(new Paragraph(new Run("Added themed dialogs")));
+            list.ListItems.Add(listItem3);
+
+            ListItem listItem4 = new ListItem(new Paragraph(new Run("Fly safe, Cmdr! o7")));
+            list.ListItems.Add(listItem4);
+
+            whatsNewWindow.WhatsNewText.Document.Blocks.Add(list);
+
+            whatsNewWindow.Owner = this; // Set owner to this MainWindow
+            whatsNewWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner; // Center the window over its owner
+
+            whatsNewWindow.ShowDialog();
+        }
+
+
+
+
+
+
+
 
         private void Btn_Launch_Click(object sender, RoutedEventArgs e)
         {
@@ -577,6 +637,7 @@ private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
                 CheckEdLaunchInProfile();
                 _isChecking = false;
             }
+            ShowWhatsNewIfUpdated();
         }
 
         private void ModifyTheme(Uri newThemeUri)
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
index ced0e42..c367b66 100644
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -70,5 +70,17 @@ public bool UpdateSettings {
                 this["UpdateSettings"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string LastSeenVersion {
+            get {
+                return ((string)(this["LastSeenVersion"]));
+            }
+            set {
+                this["LastSeenVersion"] = value;
+            }
+        }
     }
 }
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
index 4c7fde5..c9e9d69 100644
--- a/Properties/Settings.settings
+++ b/Properties/Settings.settings
@@ -14,5 +14,8 @@
     <Setting Name="UpdateSettings" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="LastSeenVersion" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/WhatsNew.xaml b/WhatsNew.xaml
new file mode 100644
index 0000000..923718c
--- /dev/null
+++ b/WhatsNew.xaml
@@ -0,0 +1,39 @@
+<Window x:Class="Elite_Dangerous_Addon_Launcer_V2.WhatsNewWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:Elite_Dangerous_Addon_Launcer_V2"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        Title="What's New" 
+        Width="600" 
+        Height="400"
+        TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+        TextElement.FontWeight="Regular"
+        TextElement.FontSize="14"
+        TextOptions.TextFormattingMode="Ideal" 
+        TextOptions.TextRenderingMode="Auto"        
+        Background="{DynamicResource MaterialDesignPaper}"
+        FontFamily="{DynamicResource MaterialDesignFont}">
+    <materialDesign:Card>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+
+            <RichTextBox x:Name="WhatsNewText" 
+                         Grid.Row="0" 
+                         IsReadOnly="True" 
+                         ScrollViewer.VerticalScrollBarVisibility="Auto"
+                         Margin="10">
+                <FlowDocument/>
+            </RichTextBox>
+
+            <Button x:Name="CloseButton" 
+                    Grid.Row="1" 
+                    Content="Close" 
+                    Margin="10" 
+                    HorizontalAlignment="Right" 
+                    Click="Bt_Close_Click"/>
+        </Grid>
+    </materialDesign:Card>
+</Window>
diff --git a/WhatsNew.xaml.cs b/WhatsNew.xaml.cs
new file mode 100644
index 0000000..79ed331
--- /dev/null
+++ b/WhatsNew.xaml.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Elite_Dangerous_Addon_Launcer_V2
+{
+    /// <summary>
+    /// Interaction logic for WhatsNew.xaml
+    /// </summary>
+    public partial class WhatsNewWindow : Window
+    {
+        public WhatsNewWindow()
+        {
+            InitializeComponent();
+        }
+        private void Bt_Close_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+    }
+}