From 1e169450e39a9d8fec163d63e51050ebbbffc79c Mon Sep 17 00:00:00 2001
From: Slivo-fr <gchopelet@gmail.com>
Date: Mon, 5 Jul 2021 15:25:30 +0200
Subject: [PATCH 1/4] Removes API, removes advanced increment settings

---
 Elinor/AboutWindow.xaml                     |   2 -
 Elinor/ApiImportSelectFactionWindow.xaml    |  26 ---
 Elinor/ApiImportSelectFactionWindow.xaml.cs |  85 ----------
 Elinor/ApiImportWindow.xaml                 |  28 ----
 Elinor/ApiImportWindow.xaml.cs              | 169 --------------------
 Elinor/CharWrapper.cs                       |  15 --
 Elinor/ClipboardTools.cs                    |  24 +--
 Elinor/Elinor reloaded.csproj               |  24 ---
 Elinor/MainWindow.xaml                      |  76 ++-------
 Elinor/MainWindow.xaml.cs                   | 143 +----------------
 Elinor/NewProfileWindows.xaml               |  11 --
 Elinor/NewProfileWindows.xaml.cs            |  92 -----------
 Elinor/Profile.cs                           |  68 +-------
 Elinor/Properties/AssemblyInfo.cs           |   4 +-
 Elinor/StandingWrapper.cs                   |  20 ---
 Elinor/Updates.cs                           |   2 -
 Elinor/currentVersion.xml                   |   2 +-
 17 files changed, 27 insertions(+), 764 deletions(-)
 delete mode 100644 Elinor/ApiImportSelectFactionWindow.xaml
 delete mode 100644 Elinor/ApiImportSelectFactionWindow.xaml.cs
 delete mode 100644 Elinor/ApiImportWindow.xaml
 delete mode 100644 Elinor/ApiImportWindow.xaml.cs
 delete mode 100644 Elinor/CharWrapper.cs
 delete mode 100644 Elinor/NewProfileWindows.xaml
 delete mode 100644 Elinor/NewProfileWindows.xaml.cs
 delete mode 100644 Elinor/StandingWrapper.cs

diff --git a/Elinor/AboutWindow.xaml b/Elinor/AboutWindow.xaml
index 443e065..c4aa563 100644
--- a/Elinor/AboutWindow.xaml
+++ b/Elinor/AboutWindow.xaml
@@ -26,7 +26,5 @@
         <Label Content="SUPPORT_NAME" Height="28" HorizontalAlignment="Left" Margin="69,167,0,0" x:Name="LblSupport"
             MouseEnter="LblSupportMouseEnter" MouseDown="LblSupportMouseDown" VerticalAlignment="Top"
             Foreground="Blue" Cursor="Hand" MouseLeave="LblSupportMouseLeave" Panel.ZIndex="1" />
-        <Label Content="Thanks to Cuhlen for EVE.Net" Height="28" HorizontalAlignment="Left" Margin="234,148,0,0"
-            x:Name="label5_Copy" VerticalAlignment="Top" FontStyle="Italic" />
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/Elinor/ApiImportSelectFactionWindow.xaml b/Elinor/ApiImportSelectFactionWindow.xaml
deleted file mode 100644
index 604a246..0000000
--- a/Elinor/ApiImportSelectFactionWindow.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Window x:Class="Elinor.ApiImportSelectFactionWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Title="Select station's corp and faction" Height="194" Width="409"
-        ResizeMode="CanMinimize" Loaded="WindowLoaded" Icon="/Elinor;component/Images/mainicon.png">
-  <Grid>
-    <Label Content="Corporation" Height="28" HorizontalAlignment="Left" Margin="12,12,0,0" Name="label1"
-           VerticalAlignment="Top" />
-    <Label Content="Faction" Height="28" HorizontalAlignment="Left" Margin="12,46,0,0" Name="label2"
-           VerticalAlignment="Top" />
-    <ComboBox Height="23" HorizontalAlignment="Left" Margin="104,15,0,0" Name="cbCorp" VerticalAlignment="Top"
-              Width="271" />
-    <ComboBox Height="23" HorizontalAlignment="Left" Margin="104,49,0,0" Name="cbFaction" VerticalAlignment="Top"
-              Width="271" />
-    <Button Content="OK" Height="23" HorizontalAlignment="Right" Margin="0,0,12,12" Name="btnOk"
-            VerticalAlignment="Bottom" Width="75" Click="BtnOkClick" />
-        <Image Height="27" HorizontalAlignment="Left" Margin="348,78,0,0" Name="imgHelp" Stretch="Fill" VerticalAlignment="Top" Width="27" Source="/Elinor;component/Images/52_64_9.png">
-            <Image.ToolTip>               
-                <TextBlock>
-                    The Broker's fee depends partially on your standing towards the corporation owning<LineBreak/>
-                    the station you're in and the faction that corporation belongs to.<LineBreak/>
-                    The corporation that owns the station is displayed at the top of the<LineBreak/>
-                    "Station Services" window on the right when docked.
-                </TextBlock>
-            </Image.ToolTip>
-        </Image>
-    </Grid>
-</Window>
\ No newline at end of file
diff --git a/Elinor/ApiImportSelectFactionWindow.xaml.cs b/Elinor/ApiImportSelectFactionWindow.xaml.cs
deleted file mode 100644
index 2f1455a..0000000
--- a/Elinor/ApiImportSelectFactionWindow.xaml.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using System.Globalization;
-using System.Windows;
-using System.Windows.Controls;
-using EVE.Net.Character;
-
-namespace Elinor
-{
-    /// <summary>
-    /// Interaction logic for ApiImportSelectFactionWindow.xaml
-    /// </summary>
-    public partial class ApiImportSelectFactionWindow
-    {
-        private readonly CharWrapper _chara;
-        public double corpStanding;
-        public double factionStanding;
-        public string corpName;
-        public string factionName;
-
-        internal ApiImportSelectFactionWindow(CharWrapper chr)
-        {
-            InitializeComponent();
-            _chara = chr;
-        }
-
-        private void WindowLoaded(object sender, RoutedEventArgs e)
-        {
-            var none = new StandingWrapper("<None>", .0);
-            cbCorp.Items.Add(none);
-            cbFaction.Items.Add(none);
-            cbCorp.SelectedIndex = 0;
-            cbFaction.SelectedIndex = 0;
-
-            var standings = new NPCStandings(
-                _chara.KeyId, 
-                _chara.VCode,
-                _chara.CharId.ToString(CultureInfo.InvariantCulture)
-            );
-
-            standings.Query();
-
-            foreach (NPCStandings.Standing standing in standings.standings.NPCCorporations)
-            {
-                var wrap = new StandingWrapper(standing.fromName, standing.standing);
-                cbCorp.Items.Add(wrap);
-            }
-
-            foreach (NPCStandings.Standing standing in standings.standings.factions)
-            {
-                var wrap = new StandingWrapper(standing.fromName, standing.standing);
-                cbFaction.Items.Add(wrap);
-            }
-
-            ToolTipService.SetShowDuration(imgHelp, int.MaxValue);
-        }
-
-        private void BtnOkClick(object sender, RoutedEventArgs e)
-        {
-            
-            corpStanding = ((StandingWrapper)cbCorp.SelectedItem).standing;
-
-            if (corpStanding == 0)
-            {
-                corpName = null;
-            }
-            else
-            {
-                corpName = ((StandingWrapper)cbCorp.SelectedItem).name; 
-            }
-            
-            factionStanding = ((StandingWrapper) cbFaction.SelectedItem).standing;
-
-            if (factionStanding == 0)
-            {
-                factionName = null;
-            }
-            else
-            {
-                factionName = ((StandingWrapper)cbFaction.SelectedItem).name;
-            }
-
-            DialogResult = true;
-            Close();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Elinor/ApiImportWindow.xaml b/Elinor/ApiImportWindow.xaml
deleted file mode 100644
index f59bdbd..0000000
--- a/Elinor/ApiImportWindow.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Window x:Class="Elinor.ApiImportWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Title="Enter API information" Height="239" Width="453"
-        ResizeMode="CanMinimize" Loaded="WindowLoaded" Icon="/Elinor;component/Images/mainicon.png" Topmost="True">
-  <Grid>
-    <Label Content="Key ID" Height="28" HorizontalAlignment="Left" Margin="12,12,0,0" Name="label1"
-           VerticalAlignment="Top" />
-    <Label Content="VCode" Height="28" HorizontalAlignment="Left" Margin="12,46,0,0" Name="label2"
-           VerticalAlignment="Top" />
-    <Label Content="Character" Height="28" HorizontalAlignment="Left" Margin="12,120,0,0" Name="lblChar"
-           VerticalAlignment="Top" Visibility="Hidden" Width="63" />
-    <ComboBox Height="23" Margin="90,123,0,0" Name="cbChars" VerticalAlignment="Top" Visibility="Hidden"
-              HorizontalAlignment="Left" Width="329" />
-    <TextBox Height="23" HorizontalAlignment="Left" Margin="90,14,0,0" Name="tbKeyId" VerticalAlignment="Top"
-             Width="329" />
-    <TextBox Height="23" HorizontalAlignment="Left" Margin="90,48,0,0" Name="tbVCode" VerticalAlignment="Top"
-             Width="329" />
-    <Button Content="Get characters" Height="23" HorizontalAlignment="Left" Margin="325,77,0,0" Name="btnGetChars"
-            VerticalAlignment="Top" Width="94" Click="BtnGetCharsClick" />
-    <Button Content="OK" Height="23" HorizontalAlignment="Left" Margin="344,165,0,0" Name="btnOk"
-            VerticalAlignment="Top" Width="75" Click="BtnOkClick" IsEnabled="False" />
-    <Button Content="Cancel" Height="23" HorizontalAlignment="Left" Margin="263,165,0,0" Name="btnCancel"
-            VerticalAlignment="Top" Width="75" Click="BtnCancelClick" />
-    <ProgressBar Height="23" HorizontalAlignment="Left" Margin="12,165,0,0" Name="pbLoading"
-                 VerticalAlignment="Top" Width="245" Visibility="Hidden" IsIndeterminate="True" />
-    <Button Content="Create new API key" Height="23" HorizontalAlignment="Left" Margin="199,77,0,0"
-            Name="btnCreateKey" VerticalAlignment="Top" Width="120" Click="BtnCreateKeyClick" />
-  </Grid>
-</Window>
\ No newline at end of file
diff --git a/Elinor/ApiImportWindow.xaml.cs b/Elinor/ApiImportWindow.xaml.cs
deleted file mode 100644
index 57b29c8..0000000
--- a/Elinor/ApiImportWindow.xaml.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Globalization;
-using System.Windows;
-using EVE.Net;
-using EVE.Net.Character;
-
-namespace Elinor
-{
-    /// <summary>
-    /// Interaction logic for ApiImportWindow.xaml
-    /// </summary>
-    public partial class ApiImportWindow
-    {
-        public Profile profile = new Profile();
-        private bool? _getStandingAccess;
-
-        public ApiImportWindow()
-        {
-            InitializeComponent();
-            profile.accounting = 0;
-            profile.brokerRelations = 0;
-            profile.keyId = null;
-            profile.vcode = null;
-            profile.charName = null;
-            profile.isAPI = true;
-        }
-
-        private void BtnGetCharsClick(object sender, RoutedEventArgs e)
-        {
-            cbChars.Items.Clear();
-
-            try
-            {
-                profile.keyId = tbKeyId.Text;
-                profile.vcode = tbVCode.Text;
-
-                var info = new APIKeyInfo(profile.keyId.ToString(CultureInfo.InvariantCulture), profile.vcode);
-                info.Query();
-
-                if (info.characters.Count == 0)
-                {
-                    MessageBox.Show(
-                        "No characters for this API information.\nPlease check you API information",
-                        "No characters found", 
-                        MessageBoxButton.OK, 
-                        MessageBoxImage.Warning
-                    );
-                }
-                else
-                {
-                    lblChar.Visibility = Visibility.Visible;
-                    cbChars.Visibility = Visibility.Visible;
-
-                    foreach (APIKeyInfo.Character chr in info.characters)
-                    {
-                        var chara = new CharWrapper
-                        {
-                            KeyId = profile.keyId,
-                            VCode = profile.vcode,
-                            Charname = chr.characterName,
-                            CharId = chr.characterID
-                        };
-
-                        cbChars.Items.Add(chara);
-                        cbChars.SelectedIndex = 0;
-                    }
-                    if (cbChars.Items.Count > 0)
-                    {
-                        btnOk.IsEnabled = true;
-                    }
-                }
-            }
-            catch (FormatException)
-            {
-                MessageBox.Show(
-                    "Key ID must be a number", 
-                    "Invalid Key ID", 
-                    MessageBoxButton.OK,
-                    MessageBoxImage.Warning
-                );
-            }
-        }
-
-        private void WindowLoaded(object sender, RoutedEventArgs e)
-        {
-            tbKeyId.Focus();
-        }
-
-        private void BtnCancelClick(object sender, RoutedEventArgs e)
-        {
-            Close();
-        }
-
-        private void BtnOkClick(object sender, RoutedEventArgs e)
-        {
-            btnOk.IsEnabled = false;
-            pbLoading.Visibility = Visibility.Visible;
-            var chara = (CharWrapper) cbChars.SelectedItem;
-
-            var worker = new BackgroundWorker();
-            _getStandingAccess = true;
-
-            worker.RunWorkerCompleted += delegate
-            {
-                if (_getStandingAccess == true) DialogResult = true;
-                else Dispatcher.Invoke(new Action(Close));
-            };
-
-            worker.DoWork += delegate
-            {
-                var sheet = new CharacterSheet(chara.KeyId, chara.VCode, chara.CharId.ToString(CultureInfo.InvariantCulture));
-                sheet.Query();
-
-                foreach (CharacterSheet.Skill skill in sheet.skills)
-                {
-                    if (skill.typeID == 3446) //"Broker Relations"
-                        profile.brokerRelations = skill.level;
-                    if (skill.typeID == 16622) //"Accounting" 
-                        profile.accounting = skill.level;
-                }
-
-                Dispatcher.Invoke(new Action(delegate
-                {
-                    var aisfw = new ApiImportSelectFactionWindow(chara)
-                    {
-                        Topmost = true,
-                        Top = Top + 10,
-                        Left = Left + 10,
-                    };
-
-                    _getStandingAccess = aisfw.ShowDialog();
-
-                    if (_getStandingAccess == true)
-                    {
-                        profile.corpStanding = aisfw.corpStanding;
-                        profile.factionStanding = aisfw.factionStanding;
-                        profile.corporation = aisfw.corpName;
-                        profile.faction = aisfw.factionName;
-                    }
-                    else
-                    {
-                        _getStandingAccess = false;
-                    }
-                }));
-
-                profile.charName = chara.Charname;
-                profile.charId = chara.CharId;
-
-                if (profile.corporation != null)
-                {
-                    profile.profileName = chara.Charname + " - " + profile.corporation;
-                }
-                else
-                {
-                    profile.profileName = chara.Charname + " - no corporation";
-                }
-            };
-
-            worker.RunWorkerAsync();
-        }
-
-        private void BtnCreateKeyClick(object sender, RoutedEventArgs e)
-        {
-            Process.Start(@"https://community.eveonline.com/support/api-key/CreatePredefined?accessMask=1099431944");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Elinor/CharWrapper.cs b/Elinor/CharWrapper.cs
deleted file mode 100644
index 0d331cd..0000000
--- a/Elinor/CharWrapper.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace Elinor
-{
-    internal class CharWrapper
-    {
-        internal long CharId { get; set; }
-        internal string KeyId { get; set; }
-        internal string Charname { get; set; }
-        internal string VCode { get; set; }
-
-        public override string ToString()
-        {
-            return Charname;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Elinor/ClipboardTools.cs b/Elinor/ClipboardTools.cs
index 335b3d8..992ff3e 100644
--- a/Elinor/ClipboardTools.cs
+++ b/Elinor/ClipboardTools.cs
@@ -38,17 +38,7 @@ internal static double GetSellPrice(double sell, Profile settings)
             if (settings == null) return .0;
 
             double result = sell;
-
-            if (settings.advancedStepSettings)
-            {
-                result -= (result*settings.sellPercentage > settings.sellThreshold)
-                              ? settings.sellThreshold
-                              : settings.sellPercentage*result;
-            }
-            else
-            {
-                result -= Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
-            }
+            result -= Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
 
             return result;
         }
@@ -58,17 +48,7 @@ internal static double GetBuyPrice(double buy, Profile settings)
             if (settings == null) return .0;
 
             double result = buy;
-
-            if (settings.advancedStepSettings)
-            {
-                result += result*settings.buyPercentage > settings.buyThreshold
-                              ? settings.buyThreshold
-                              : settings.buyPercentage*result;
-            }
-            else
-            {
-                result += Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
-            }
+            result += Math.Max(Math.Pow(10, Math.Floor(Math.Log10(result / 1000))), 0.01);
 
             return result;
         }
diff --git a/Elinor/Elinor reloaded.csproj b/Elinor/Elinor reloaded.csproj
index 1e66ec6..e8ababb 100644
--- a/Elinor/Elinor reloaded.csproj	
+++ b/Elinor/Elinor reloaded.csproj	
@@ -106,14 +106,7 @@
     <Compile Include="AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ApiImportSelectFactionWindow.xaml.cs">
-      <DependentUpon>ApiImportSelectFactionWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ApiImportWindow.xaml.cs">
-      <DependentUpon>ApiImportWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="CacheTools.cs" />
-    <Compile Include="CharWrapper.cs" />
     <Compile Include="ComboBoxItem.cs" />
     <Compile Include="MessageBoxEx.cs" />
     <Compile Include="Profiles.cs" />
@@ -124,28 +117,16 @@
     <Compile Include="SelectLogPathWindow.xaml.cs">
       <DependentUpon>SelectLogPathWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="StandingWrapper.cs" />
     <Compile Include="ProfileNameWindow.xaml.cs">
       <DependentUpon>ProfileNameWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Serializer.cs" />
     <Compile Include="Profile.cs" />
     <Compile Include="Updates.cs" />
-    <Compile Include="NewProfileWindows.xaml.cs">
-      <DependentUpon>NewProfileWindows.xaml</DependentUpon>
-    </Compile>
     <Page Include="AboutWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ApiImportSelectFactionWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ApiImportWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -167,10 +148,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="NewProfileWindows.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -241,7 +218,6 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="currentVersion.xml" />
-    <Content Include="EVE.Net.dll" />
     <Resource Include="Images\52_64_9.png" />
   </ItemGroup>
   <ItemGroup />
diff --git a/Elinor/MainWindow.xaml b/Elinor/MainWindow.xaml
index 77426e5..9dc5443 100644
--- a/Elinor/MainWindow.xaml
+++ b/Elinor/MainWindow.xaml
@@ -235,38 +235,26 @@
             </TabItem>
             <TabItem Header="Trade settings" Name="tiTradeSettings" LostFocus="tiTradeSettingsLostFocus" GotFocus="tiTradeSettingsGotFocus">
                 <Grid>
-                    <CheckBox Content="Enable advanced increment settings" Height="16" HorizontalAlignment="Left"
-                    Margin="18,12,0,0" Name="cbAdvancedSettings" VerticalAlignment="Top" Checked="CbAdvancedSettingsChecked"
-                    Unchecked="CbAdvancedSettingsUnchecked" />
-                    <GroupBox Header="Advanced increment settings" Height="90" Margin="12,34,12,0"
-                    Name="gbAdvancedSettings" VerticalAlignment="Top" IsEnabled="False">
+
+                    <GroupBox Header="Broker settings" Height="106" Margin="12,12,12,0"
+                        Name="gbBuyCustomBroker" VerticalAlignment="Top">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
-                            <Label Content="Sell price fraction [%]" Height="28" HorizontalAlignment="Left"
-                     Margin="6,6,0,0" Name="lblSellFract" VerticalAlignment="Top" />
-                            <Label Content="Threshold [ISK]" Height="28" HorizontalAlignment="Left" Margin="6,33,0,0"
-                     Name="lblSellThresh" VerticalAlignment="Top" />
-                            <Label Grid.Column="1" Content="Buy price fraction [%]" Height="28"
-                     HorizontalAlignment="Left" Margin="6,6,0,0" Name="lblBuyFract" VerticalAlignment="Top" />
-                            <Label Grid.Column="1" Content="Threshold [ISK]" Height="28" Margin="6,33,0,0"
-                     Name="lblBuyThresh" VerticalAlignment="Top" HorizontalAlignment="Left" Width="124" />
-                            <TextBox Height="23" Margin="134,8,8,0" Name="tbSellFract" VerticalAlignment="Top"
-                       TextChanged="TbSellFractTextChanged" />
-                            <TextBox Height="23" Margin="134,35,8,0" Name="tbSellThresh" VerticalAlignment="Top"
-                       TextChanged="TbSellThreshTextChanged" />
-                            <TextBox Height="23" Margin="134,8,8,0" Name="tbBuyFract" VerticalAlignment="Top"
-                       Grid.Column="1" TextChanged="TbBuyFractTextChanged" />
-                            <TextBox Height="23" Margin="134,35,8,0" Name="tbBuyThresh" VerticalAlignment="Top"
-                       Grid.Column="1" TextChanged="TbBuyThreshTextChanged" />
+
+                            <CheckBox x:Name="cbUseCustomBuyBroker" Content="Use custom broker free for buys" Margin="0,12,12,0" Checked="cbUseCustomBuyBrokerChecked" Unchecked="cbUseCustomBuyBrokerUnchecked" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Width="200" />
+                            <TextBox TextChanged="TbCustomBuyBrokerChanged"  TextAlignment="Right" Height="23" HorizontalAlignment="Left" Margin="116,10,0,0" Name="tbCustomBuyBroker" VerticalAlignment="Top" Width="80" Text="2" Grid.Column="1" />
+                            <Label Content="%" Height="28" HorizontalAlignment="Left" Margin="195,8,0,0" Name="labelpercentbrokerbuy" VerticalAlignment="Top" Grid.Column="1" />
+
+                            <CheckBox x:Name="cbUseCustomSellBroker" Content="Use custom broker free for sells" Margin="0,50,12,0" Checked="cbUseCustomSellBrokerChecked" Unchecked="cbUseCustomSellBrokerUnchecked" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Width="200" />
+                            <TextBox TextChanged="TbCustomSellBrokerChanged"  TextAlignment="Right" Height="23" HorizontalAlignment="Left" Margin="116,48,0,0" Name="tbCustomSellBroker" VerticalAlignment="Top" Width="80" Text="2" Grid.Column="1" />
+                            <Label Content="%" Height="28" HorizontalAlignment="Left" Margin="195,45,0,0" Name="labelpercentbrokersell" VerticalAlignment="Top" Grid.Column="1" />
                         </Grid>
                     </GroupBox>
 
-                    <Separator Height="5" Margin="12,138,12,0" Name="sprt2" VerticalAlignment="Top" Width="Auto" />
-
-                    <GroupBox Header="Margins" Margin="12,148,12,0" Name="gbMarginsSettings" Height="71"
+                    <GroupBox Header="Margins" Margin="12,125,12,0" Name="gbMarginsSettings" Height="71"
                     VerticalAlignment="Top">
                         <Grid Height="42">
                             <Grid.ColumnDefinitions>
@@ -304,37 +292,6 @@
                 </Grid>
 
             </TabItem>
-            <TabItem Header="Broker settings" Name="tiBrokerSettings" LostFocus="tiRangeSettingsLostFocus" GotFocus="tiRangeSettingsGotFocus">
-                <Grid>
-                    <GroupBox Header="Buy orders" Height="61" Margin="12,12,12,0"
-                        Name="gbBuyCustomBroker" VerticalAlignment="Top">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <CheckBox x:Name="cbUseCustomBuyBroker" Content="Use custom broker free" Margin="0,12,12,0" Checked="cbUseCustomBuyBrokerChecked" Unchecked="cbUseCustomBuyBrokerUnchecked" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Width="200" />
-                            <TextBox TextChanged="TbCustomBuyBrokerChanged"  TextAlignment="Right" Height="23" HorizontalAlignment="Left" Margin="116,9,0,0" Name="tbCustomBuyBroker" VerticalAlignment="Top" Width="80" Text="2" Grid.Column="1" />
-                            <Label Content="%" Height="28" HorizontalAlignment="Left" Margin="195,7,0,0" Name="labelpercentbrokerbuy" VerticalAlignment="Top" Grid.Column="1" />
-
-                        </Grid>
-                    </GroupBox>
-                    <GroupBox Header="Sell orders" Height="61" Margin="12,80,12,0"
-                        Name="gbSellCustomBroker" VerticalAlignment="Top">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <CheckBox x:Name="cbUseCustomSellBroker" Content="Use custom broker free" Margin="0,12,12,0" Checked="cbUseCustomSellBrokerChecked" Unchecked="cbUseCustomSellBrokerUnchecked" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" Width="200" />
-                            <TextBox TextChanged="TbCustomSellBrokerChanged"  TextAlignment="Right" Height="23" HorizontalAlignment="Left" Margin="116,9,0,0" Name="tbCustomSellBroker" VerticalAlignment="Top" Width="80" Text="2" Grid.Column="1" />
-                            <Label Content="%" Height="28" HorizontalAlignment="Left" Margin="195,7,0,0" Name="labelpercentbrokersell" VerticalAlignment="Top" Grid.Column="1" />
-                        </Grid>
-                    </GroupBox>
-                </Grid>
-            </TabItem>
         </TabControl>
         <StatusBar Height="23" Name="sbMain" VerticalAlignment="Bottom">
             <StatusBarItem HorizontalAlignment="Left">
@@ -393,14 +350,11 @@
                    ToolTip="Click to delete logs" />
             </StatusBarItem>
         </StatusBar>
-        <ComboBox Height="23" HorizontalAlignment="Right" Margin="0,12,203,0" Name="cbProfiles" VerticalAlignment="Top"
-              Width="235" SelectionChanged="CbProfilesSelectionChanged" ItemsSource="{Binding}" />
+        <ComboBox Height="23" HorizontalAlignment="Right" Margin="0,12,133,0" Name="cbProfiles" VerticalAlignment="Top"
+              Width="323" SelectionChanged="CbProfilesSelectionChanged" ItemsSource="{Binding}" />
 
         <Button ToolTip="Create a new profile to store display and calculations settings" Content="New" Height="23"
-            HorizontalAlignment="Right" Margin="0,12,121,0" Name="btnNew" VerticalAlignment="Top" Width="51" Click="BtnNewClick" />
-
-        <Button ToolTip="Update profile from API" Content="Update" Height="23"
-            HorizontalAlignment="Right" Margin="0,12,64,0" Name="btnUpdateProfile" VerticalAlignment="Top" Width="51" Click="btnUpdateClick" IsEnabled="False" />
+            HorizontalAlignment="Right" Margin="0,12,70,0" Name="btnNew" VerticalAlignment="Top" Width="51" Click="BtnNewClick" />
         <Label Content="Profile" Height="28" HorizontalAlignment="Left" Margin="12,11,0,0" Name="label9"
            VerticalAlignment="Top" />
         <Button ToolTip="Deletes the currently active profile" Content="Delete" Height="23" Margin="0,12,12,0"
diff --git a/Elinor/MainWindow.xaml.cs b/Elinor/MainWindow.xaml.cs
index 1f1b05f..6d22e4c 100644
--- a/Elinor/MainWindow.xaml.cs
+++ b/Elinor/MainWindow.xaml.cs
@@ -11,7 +11,6 @@
 using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using EVE.Net;
-using EVE.Net.Character;
 
 namespace Elinor
 {
@@ -417,14 +416,6 @@ private void updateSettingsDisplay()
                 cbBrokerRelations.SelectedIndex = profile.brokerRelations;
                 cbAccounting.SelectedIndex = profile.accounting;
 
-                // Trade settings
-                cbAdvancedSettings.IsChecked = profile.advancedStepSettings;
-
-                tbSellFract.Text = (profile.sellPercentage * 100).ToString(CultureInfo.InvariantCulture);
-                tbBuyFract.Text = (profile.buyPercentage * 100).ToString(CultureInfo.InvariantCulture);
-                tbSellThresh.Text = profile.sellThreshold.ToString(CultureInfo.InvariantCulture);
-                tbBuyThresh.Text = profile.buyThreshold.ToString(CultureInfo.InvariantCulture);
-
                 // Range settings
                 cbSellRange.SelectedIndex = profile.sellRange;
                 cbBuyRange.SelectedIndex = profile.buyRange;
@@ -557,15 +548,14 @@ private void BtnResetCharClick(object sender, RoutedEventArgs e)
 
         private void BtnResetTradeClick(object sender, RoutedEventArgs e)
         {
-            profile.advancedStepSettings = false;
-            profile.buyPercentage = 0;
-            profile.sellPercentage = 0;
-            profile.buyThreshold = 0;
-            profile.sellThreshold = 0;
-
             profile.marginThreshold = 0.1;
             profile.minimumThreshold = 0.02;
 
+            profile.useBuyCustomBroker = false;
+            profile.buyCustomBroker = 0.01;
+            profile.useSellCustomBroker = false;
+            profile.sellCustomBroker = 0.01;
+
             Profile.SaveSettings(profile);
             updateSettingsDisplay();
         }
@@ -596,15 +586,13 @@ private void CbProfilesSelectionChanged(object sender, SelectionChangedEventArgs
             Profile.SaveSettings(profile);
             profile = (Profile) cbProfiles.SelectedItem;
 
-            btnUpdateProfile.IsEnabled = (profile.isAPIProfile()) ? true : false;
-
             updateSettingsDisplay();
             if (_lastEvent != null) FileSystemWatcherOnCreated(this, _lastEvent);
         }
 
         private void BtnNewClick(object sender, RoutedEventArgs e)
         {
-            var window = new NewProfileWindow(this)
+            var window = new ProfileNameWindow(this)
             {
                 Topmost = true,
                 Top = Top + Height / 10,
@@ -614,77 +602,6 @@ private void BtnNewClick(object sender, RoutedEventArgs e)
             window.ShowDialog();
         }
 
-        public void btnUpdateClick(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                // Skills
-                var sheet = new CharacterSheet(
-                    profile.keyId,
-                    profile.vcode,
-                    profile.charId.ToString(CultureInfo.InvariantCulture)
-                );
-
-                sheet.Query();
-
-                if (sheet.characterID > 0)
-                {
-                    foreach (CharacterSheet.Skill skill in sheet.skills)
-                    {
-                        if (skill.typeID == 3446) //"Broker Relations"
-                            profile.brokerRelations = skill.level;
-                        if (skill.typeID == 16622) //"Accounting" 
-                            profile.accounting = skill.level;
-                    }
-
-                    //Standings
-                    var standings = new NPCStandings(
-                        profile.keyId,
-                        profile.vcode,
-                        profile.charId.ToString(CultureInfo.InvariantCulture)
-                    );
-
-                    standings.Query();
-
-                    if (profile.corporation != null)
-                    {
-                        foreach (NPCStandings.Standing standing in standings.standings.NPCCorporations)
-                        {
-                            if (profile.corporation == standing.fromName)
-                            {
-                                profile.corpStanding = standing.standing;
-                            }
-                        }
-                    }
-
-                    if (profile.faction != null)
-                    {
-                        foreach (NPCStandings.Standing standing in standings.standings.factions)
-                        {
-                            if (profile.faction == standing.fromName)
-                            {
-                                profile.factionStanding = standing.standing;
-                            }
-                        }
-                    }
-
-                    updateSettingsDisplay(); ;
-
-                    MessageBox.Show("Profile successfully updated");
-                }
-                else
-                {
-                    MessageBox.Show("An error occured while updating the profile. The API key might have been deleted or modified.");
-                }
-
-
-            }
-            catch (Exception)
-            {
-                MessageBox.Show("An error occured while updating the profile.");
-            }
-        }
-
         private void BtnDeleteClick(object sender, RoutedEventArgs e)
         {
             if (cbProfiles.SelectedItem.ToString() == "Default") return;
@@ -762,54 +679,6 @@ private void RbChecked(object sender, RoutedEventArgs e)
             ClipboardTools.SetClipboardWrapper(price);
         }
 
-        private void CbAdvancedSettingsChecked(object sender, RoutedEventArgs e)
-        {
-            profile.advancedStepSettings = true;
-            gbAdvancedSettings.IsEnabled = true;
-        }
-
-        private void CbAdvancedSettingsUnchecked(object sender, RoutedEventArgs e)
-        {
-            profile.advancedStepSettings = false;
-            gbAdvancedSettings.IsEnabled = false;
-        }
-
-        private void TbSellFractTextChanged(object sender, TextChangedEventArgs e)
-        {
-            double fract;
-            if (double.TryParse(tbSellFract.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out fract))
-            {
-                profile.sellPercentage = fract/100;
-            }
-        }
-
-        private void TbSellThreshTextChanged(object sender, TextChangedEventArgs e)
-        {
-            double thresh;
-            if (double.TryParse(tbSellThresh.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out thresh))
-            {
-                profile.sellThreshold = thresh;
-            }
-        }
-
-        private void TbBuyFractTextChanged(object sender, TextChangedEventArgs e)
-        {
-            double fract;
-            if (double.TryParse(tbBuyFract.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out fract))
-            {
-                profile.buyPercentage = fract/100;
-            }
-        }
-
-        private void TbBuyThreshTextChanged(object sender, TextChangedEventArgs e)
-        {
-            double thresh;
-            if (double.TryParse(tbBuyThresh.Text, NumberStyles.Any, CultureInfo.InvariantCulture, out thresh))
-            {
-                profile.buyThreshold = thresh;
-            }
-        }
-
         private void TbCorpStandingTextChanged(object sender, TextChangedEventArgs e)
         {
             double standing;
diff --git a/Elinor/NewProfileWindows.xaml b/Elinor/NewProfileWindows.xaml
deleted file mode 100644
index 574ea8b..0000000
--- a/Elinor/NewProfileWindows.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Window x:Class="Elinor.NewProfileWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" mc:Ignorable="d" 
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-        d:DesignHeight="229" SizeToContent="WidthAndHeight" d:DesignWidth="423" Title="New profile" ResizeMode="NoResize">
-        
-    <Grid Height="188">
-        <Button Content="Import from eve API" Height="75" HorizontalAlignment="Left" Margin="12,15,12,12" Name="btnImportAPI" VerticalAlignment="Top" Width="375" Background="#1E000000" BorderBrush="#9B000000" Focusable="False" Click="btnImportAPI_Click" />
-        <Button Content="New empty profile" Height="75" HorizontalAlignment="Left" Margin="12,100,12,12" Name="btnCreateNew" Width="375" Focusable="False" Background="#1E000000" BorderBrush="#9B000000" Click="btnCreateNew_Click" />
-    </Grid>
-</Window>
diff --git a/Elinor/NewProfileWindows.xaml.cs b/Elinor/NewProfileWindows.xaml.cs
deleted file mode 100644
index bb03cc4..0000000
--- a/Elinor/NewProfileWindows.xaml.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-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;
-using System.IO;
-
-namespace Elinor
-{
-    /// <summary>
-    /// Logique d'interaction pour NewProfileWindow.xaml
-    /// </summary>
-    public partial class NewProfileWindow : Window
-    {
-
-        protected MainWindow mainWindow;
-
-        public NewProfileWindow(MainWindow mainWindow)
-        {
-            InitializeComponent();
-            this.mainWindow = mainWindow;
-        }
-
-        private void WindowKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Escape) Close();
-        }
-
-        private void btnCreateNew_Click(object sender, RoutedEventArgs e)
-        {
-            var profileNameWindow = new ProfileNameWindow(mainWindow)
-            {
-                Topmost = true,
-                Top = Top,
-                Left = Left,
-            };
-
-            profileNameWindow.ShowDialog();
-
-            if (profileNameWindow.DialogResult == true)
-            {
-                Close();
-            }
-        }
-
-        private void btnImportAPI_Click(object sender, RoutedEventArgs e)
-        {
-            var aiw = new ApiImportWindow()
-            {
-                Topmost = true,
-                Top = Top,
-                Left = Left,
-            };
-
-            if (aiw.ShowDialog() == true)
-            {
-                Profile settings = aiw.profile;
-                string fName = string.Format("profiles\\{0}.dat", settings.profileName);
-
-                if (File.Exists(fName))
-                {
-                    MessageBoxResult result = MessageBox.Show(
-                        "This profile already exist. Would you update it ?\nYou can delete the profile and import it back from a new API key if needed.",
-                        "Profile already exists",
-                        MessageBoxButton.YesNo,
-                        MessageBoxImage.Information
-                    );
-
-                    if (result == MessageBoxResult.Yes)
-                    {
-                        mainWindow.btnUpdateClick(null, null);
-                    }
-                }
-                else
-                {
-                    mainWindow.cbProfiles.Items.Add(settings);
-                    mainWindow.cbProfiles.SelectedItem = settings;
-                    mainWindow.tcMain.SelectedIndex = 1;
-                }
-
-                Close();
-            }            
-        }
-    }
-}
diff --git a/Elinor/Profile.cs b/Elinor/Profile.cs
index 46a966a..a3c4b29 100644
--- a/Elinor/Profile.cs
+++ b/Elinor/Profile.cs
@@ -18,19 +18,6 @@ public Profile()
             brokerRelations = 5;
             factionStanding = .0;
             corpStanding = .0;
-            advancedStepSettings = false;
-            buyPercentage = .0;
-            buyThreshold = .0;
-            sellPercentage = .0;
-            sellThreshold = .0;
-
-            isAPI = false;
-            corporation = null;
-            faction = null;
-            charName = null;
-
-            keyId = null;
-            vcode = null;
 
             useBuyCustomBroker = false;
             buyCustomBroker = 0.01;
@@ -64,28 +51,6 @@ public Profile(SerializationInfo info, StreamingContext ctxt)
                         factionStanding = (double)info.GetValue("factionstanding", typeof(double)); break;
                     case "corpstanding":
                         corpStanding = (double)info.GetValue("corpstanding", typeof(double)); break;
-                    case "advancedstepsettings":
-                        advancedStepSettings = info.GetBoolean("advancedstepsettings"); break;
-                    case "buypercentage":
-                        buyPercentage = info.GetDouble("buypercentage"); break;
-                    case "buythreshold":
-                        buyThreshold = info.GetDouble("buythreshold"); break;
-                    case "sellpercentage":
-                        sellPercentage = info.GetDouble("sellpercentage"); break;
-                    case "sellthreshold":
-                        sellThreshold = info.GetDouble("sellthreshold"); break;
-                    case "isAPI":
-                        isAPI = info.GetBoolean("isAPI"); break;
-                    case "corporation":
-                        corporation = (String)info.GetValue("corporation", typeof(String)); break;
-                    case "faction":
-                        faction = (String)info.GetValue("faction", typeof(String)); break;
-                    case "charName":
-                        charName = (String)info.GetValue("charName", typeof(String)); break;
-                    case "keyId":
-                        keyId = (String)info.GetValue("keyId", typeof(String)); break;
-                    case "vcode":
-                        vcode = (String)info.GetValue("vcode", typeof(String)); break;
                     case "useBuyCustomBroker":
                         useBuyCustomBroker = info.GetBoolean("useBuyCustomBroker"); break;
                     case "buyCustomBroker":
@@ -110,19 +75,6 @@ public Profile(SerializationInfo info, StreamingContext ctxt)
         internal int brokerRelations { get; set; }
         internal double factionStanding { get; set; }
         internal double corpStanding { get; set; }
-        internal bool advancedStepSettings { get; set; }
-        internal double buyPercentage { get; set; }
-        internal double buyThreshold { get; set; }
-        internal double sellPercentage { get; set; }
-        internal double sellThreshold { get; set; }
-
-        internal bool isAPI { get; set; }
-        internal String corporation { get; set; }
-        internal String faction { get; set; }
-        internal String charName { get; set; }
-
-        internal String keyId { get; set; }
-        internal String vcode { get; set; }
 
         internal bool useBuyCustomBroker { get; set; }
         internal double buyCustomBroker { get; set; }
@@ -158,19 +110,6 @@ public void GetObjectData(SerializationInfo info, StreamingContext context)
             info.AddValue("brokerrelations", brokerRelations);
             info.AddValue("factionstanding", factionStanding);
             info.AddValue("corpstanding", corpStanding);
-            info.AddValue("advancedstepsettings", advancedStepSettings);
-            info.AddValue("buypercentage", buyPercentage);
-            info.AddValue("buythreshold", buyThreshold);
-            info.AddValue("sellpercentage", sellPercentage);
-            info.AddValue("sellthreshold", sellThreshold);
-
-            info.AddValue("isAPI", isAPI);
-            info.AddValue("corporation", corporation);
-            info.AddValue("faction", faction);
-            info.AddValue("charName", charName);
-
-            info.AddValue("keyId", keyId);
-            info.AddValue("vcode", vcode);
 
             info.AddValue("useBuyCustomBroker", useBuyCustomBroker);
             info.AddValue("buyCustomBroker", buyCustomBroker);
@@ -196,7 +135,7 @@ public static Profile ReadSettings(string profileName)
                 {
                     return Serializer.DeSerializeObject(string.Format("profiles\\{0}.dat", profileName));
                 }
-                catch (Exception exception)
+                catch (Exception)
                 {
                     return null;
                 }
@@ -218,10 +157,5 @@ public static void SaveSettings(Profile profile)
                 profile
             );
         }
-
-        public bool isAPIProfile()
-        {
-            return isAPI;
-        }
     }
 }
\ No newline at end of file
diff --git a/Elinor/Properties/AssemblyInfo.cs b/Elinor/Properties/AssemblyInfo.cs
index 5444b86..99e3487 100644
--- a/Elinor/Properties/AssemblyInfo.cs
+++ b/Elinor/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.0.0")]
-[assembly: AssemblyFileVersion("1.8.0.0")]
+[assembly: AssemblyVersion("1.9.0.0")]
+[assembly: AssemblyFileVersion("1.9.0.0")]
diff --git a/Elinor/StandingWrapper.cs b/Elinor/StandingWrapper.cs
deleted file mode 100644
index 480e36c..0000000
--- a/Elinor/StandingWrapper.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace Elinor
-{
-    internal class StandingWrapper
-    {
-        public readonly string name;
-
-        internal StandingWrapper(string name, double standing)
-        {
-            this.name = name;
-            this.standing = standing;
-        }
-
-        internal double standing { get; private set; }
-
-        public override string ToString()
-        {
-            return name;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Elinor/Updates.cs b/Elinor/Updates.cs
index cb6b454..cee3fc2 100644
--- a/Elinor/Updates.cs
+++ b/Elinor/Updates.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
-using System.Net;
 using System.Reflection;
-using System.Windows;
 using System.Windows.Forms;
 using System.Xml;
 using MessageBox = System.Windows.Forms.MessageBox;
diff --git a/Elinor/currentVersion.xml b/Elinor/currentVersion.xml
index d6c6897..b94bcd4 100644
--- a/Elinor/currentVersion.xml
+++ b/Elinor/currentVersion.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <elinor>
-	<version>1.8.0.0</version>
+	<version>1.9.0.0</version>
 	<url>https://github.com/Slivo-fr/elinor-reloaded/releases</url>
 </elinor>
 

From ac582957793aa1a5b968098c0d30e619a7b68ca0 Mon Sep 17 00:00:00 2001
From: Slivo-fr <gchopelet@gmail.com>
Date: Mon, 5 Jul 2021 15:30:24 +0200
Subject: [PATCH 2/4] restore about

---
 Elinor/AboutWindow.xaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Elinor/AboutWindow.xaml b/Elinor/AboutWindow.xaml
index c4aa563..4ff3fbe 100644
--- a/Elinor/AboutWindow.xaml
+++ b/Elinor/AboutWindow.xaml
@@ -26,5 +26,7 @@
         <Label Content="SUPPORT_NAME" Height="28" HorizontalAlignment="Left" Margin="69,167,0,0" x:Name="LblSupport"
             MouseEnter="LblSupportMouseEnter" MouseDown="LblSupportMouseDown" VerticalAlignment="Top"
             Foreground="Blue" Cursor="Hand" MouseLeave="LblSupportMouseLeave" Panel.ZIndex="1" />
+        <Label Content="Thanks to Cuhlen for EVE.Net" Height="28" HorizontalAlignment="Left" Margin="234,148,0,0"
+            x:Name="label5_Copy" VerticalAlignment="Top" FontStyle="Italic" />
     </Grid>
 </Window>
\ No newline at end of file

From 623412e260d27081c7215ec63c1eab7264cb73d5 Mon Sep 17 00:00:00 2001
From: Slivo-fr <gchopelet@gmail.com>
Date: Mon, 5 Jul 2021 15:51:15 +0200
Subject: [PATCH 3/4] Restore Eve.net dll and bump version

---
 Elinor/Elinor reloaded.csproj |  1 +
 Setup/Setup.vdproj            | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Elinor/Elinor reloaded.csproj b/Elinor/Elinor reloaded.csproj
index e8ababb..28ba21f 100644
--- a/Elinor/Elinor reloaded.csproj	
+++ b/Elinor/Elinor reloaded.csproj	
@@ -218,6 +218,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="currentVersion.xml" />
+    <Content Include="EVE.Net.dll" />
     <Resource Include="Images\52_64_9.png" />
   </ItemGroup>
   <ItemGroup />
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
index bb649e7..f0adc9a 100644
--- a/Setup/Setup.vdproj
+++ b/Setup/Setup.vdproj
@@ -27,7 +27,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_D11C75DE46C6D4A095B852B5ED287BBB"
+        "MsmKey" = "8:_D6B46127BB82C63669D926A7F5097DD6"
         "OwnerKey" = "8:_03585DC2BD1048A19B1FB7CB5F6533F2"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -40,7 +40,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D11C75DE46C6D4A095B852B5ED287BBB"
+        "OwnerKey" = "8:_D6B46127BB82C63669D926A7F5097DD6"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -168,14 +168,14 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D11C75DE46C6D4A095B852B5ED287BBB"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D6B46127BB82C63669D926A7F5097DD6"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
             "AssemblyAsmDisplayName" = "8:EVE.Net, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_D11C75DE46C6D4A095B852B5ED287BBB"
+                    "_D6B46127BB82C63669D926A7F5097DD6"
                     {
                     "Name" = "8:EVE.Net.dll"
                     "Attributes" = "3:512"
@@ -266,15 +266,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Elinor reloaded"
-        "ProductCode" = "8:{AEB6EBEF-894E-4FD1-81D3-11379F3E79D3}"
-        "PackageCode" = "8:{82E55549-6456-47DB-B1F7-66AFD3C63106}"
+        "ProductCode" = "8:{5A613F8F-9FD6-4080-824A-AE4DBED39F09}"
+        "PackageCode" = "8:{CDA39DCD-B6A2-49D9-9664-C1154618F783}"
         "UpgradeCode" = "8:{F54F50ED-FDA6-4419-B476-E665ADA1FCBC}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.8.0"
+        "ProductVersion" = "8:1.9.0"
         "Manufacturer" = "8:Slivo"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -849,7 +849,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_03585DC2BD1048A19B1FB7CB5F6533F2"
             {
-            "SourcePath" = "8:"
+            "SourcePath" = "8:..\\Elinor\\obj\\x86\\Release\\Elinor.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_1022C19006BB4A9C811CB9D8739B72B3"

From b4fa5104f62037b17faa941db98530f8dd765377 Mon Sep 17 00:00:00 2001
From: Slivo-fr <gchopelet@gmail.com>
Date: Mon, 5 Jul 2021 17:25:54 +0200
Subject: [PATCH 4/4] Fix profile switch after export and market log clean

---
 Elinor/MainWindow.xaml.cs | 22 ++++++++++++++++++++--
 Elinor/MiscTools.cs       |  4 ++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Elinor/MainWindow.xaml.cs b/Elinor/MainWindow.xaml.cs
index 6d22e4c..b08f7eb 100644
--- a/Elinor/MainWindow.xaml.cs
+++ b/Elinor/MainWindow.xaml.cs
@@ -322,6 +322,7 @@ private void UpdateStatus()
 
         private void TbStatusMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
+            this._lastEvent = null;
             CacheTools.ClearMarketLogs(_logdir);
             UpdateStatus();
         }
@@ -584,10 +585,14 @@ private void CbProfilesSelectionChanged(object sender, SelectionChangedEventArgs
         {
             btnDelete.IsEnabled = cbProfiles.SelectedItem.ToString() != "Default";
             Profile.SaveSettings(profile);
-            profile = (Profile) cbProfiles.SelectedItem;
+            profile = (Profile)cbProfiles.SelectedItem;
 
             updateSettingsDisplay();
-            if (_lastEvent != null) FileSystemWatcherOnCreated(this, _lastEvent);
+            if (_lastEvent != null) {
+                FileSystemWatcherOnCreated(this, _lastEvent);
+            } else {
+                this.resetCurrentExportValues();
+            }
         }
 
         private void BtnNewClick(object sender, RoutedEventArgs e)
@@ -867,5 +872,18 @@ private void cbBuyRangeSelectionChanged(object sender, SelectionChangedEventArgs
             );
             */
         }
+
+        private void resetCurrentExportValues()
+        {
+            var cdt = new CalculateDataThread(-1, -1, this);
+            var calc = new Thread(cdt.Run);
+            calc.Start();
+
+            lblItemName.Content = "No item selected";
+            lblSell.Content = "0.00 ISK";
+            lblBuy.Content = "0.00 ISK";
+            lblBuyOrderCost.Content = "0.00 ISK";
+            lblSellOrderCost.Content = "0.00 ISK";
+        }
     }
 }
\ No newline at end of file
diff --git a/Elinor/MiscTools.cs b/Elinor/MiscTools.cs
index 615b12d..ff8039a 100644
--- a/Elinor/MiscTools.cs
+++ b/Elinor/MiscTools.cs
@@ -17,6 +17,10 @@ internal static bool IsFileLocked(FileInfo file)
             {
                 stream = file.Open(FileMode.Open, FileAccess.ReadWrite, FileShare.None);
             }
+            catch (FileNotFoundException)
+            {
+                return true;
+            }
             catch (IOException)
             {
                 return true;