Created a MRU list

src/StringMaster.Civil/StringCivilPointService.cs

@@ -222,6 +222,9 @@ public void StringCivilPoints(IList<DescriptionKey> descriptionKeys)
                         }
                     }
 
+                    if (pointCollection.Count <= 1)
+                        continue;
+
                     // Draw the polylines.
                     if (deskeyMatch.DescriptionKey.Draw2D && !hasCurve)
                         PolylineHelpers.DrawPolyline2d(tr, btr, pointCollection, layerName, deskeyMatch.DescriptionKey.AcadColor.ToColor(), isClosed);

src/StringMaster.UI/Palettes/StringCogoPointsView.xaml

@@ -5,6 +5,7 @@
     xmlns:converters="clr-namespace:StringMaster.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:helpers="clr-namespace:StringMaster.UI.Helpers"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="clr-namespace:StringMaster.UI.Models"
     xmlns:viewmodels="clr-namespace:StringMaster.UI.ViewModels"
@@ -21,7 +22,6 @@
                 <ResourceDictionary Source="pack://application:,,,/StringMaster.UI;component/Resources/ToolTips.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/StringMaster.UI;component/Resources/ToolBar.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/StringMaster.UI;component/Resources/Icons.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/StringMaster.UI;component/Resources/ComboBox.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <converters:BooleanYesNoConverter x:Key="BooleanYesNoConverter" />
             <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
@@ -31,7 +31,6 @@
             </Style>
             <Cursor x:Key="PlusCursor">pack://application:,,,/StringMaster.UI;component/Resources/Cursors/pluscursor.cur</Cursor>
             <Cursor x:Key="CheckCursor">pack://application:,,,/StringMaster.UI;component/Resources/Cursors/checkmark.cur</Cursor>
-
             <models:ColumnContext x:Key="proxy" Data="{Binding}" />
         </ResourceDictionary>
     </UserControl.Resources>
@@ -73,6 +72,30 @@
                     </Button.ToolTip>
                     <Image Source="{StaticResource ExecuteToolBarIcon}" />
                 </Button>
+                <ComboBox ItemsSource="{Binding MRUList}" SelectedItem="{Binding CurrentFileName}">
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding MRUListSelectionChanged}" CommandParameter="{Binding ElementName=myListBox, Path=SelectedItem}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                </ComboBox>
+                <Button Command="{Binding UnloadDescriptionKeyCommand}" IsEnabled="{Binding IsDescriptionKeyLoaded}">
+                    <!--<Image Source="{StaticResource RemoveToolBarIcon}" />-->
+                    <Image Width="16" Height="16">
+                        <Image.Style>
+                            <Style TargetType="Image">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Path=IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}" Value="True">
+                                        <Setter Property="Source" Value="{StaticResource RemoveToolBarIcon}" />
+                                    </DataTrigger>
+                                    <DataTrigger Binding="{Binding Path=IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Button}}" Value="False">
+                                        <Setter Property="Source" Value="{StaticResource RemoveDisabledToolBarIcon}" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Image.Style>
+                    </Image>
+                </Button>
             </ToolBar>
             <ToolBar
                 HorizontalAlignment="Right"
@@ -109,6 +132,7 @@
             ColumnHeaderStyle="{StaticResource DataGridHeader}"
             CurrentItem="{Binding SelectedKey, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             Cursor="{StaticResource PlusCursor}"
+            DockPanel.Dock="Left"
             HorizontalGridLinesBrush="{StaticResource BlueGridLine}"
             ItemsSource="{Binding DescriptionKeys, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             RowHeaderWidth="0"

src/StringMaster.UI/Palettes/StringCogoPointsView.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Controls;
 using StringMaster.UI.Services.Interfaces;

src/StringMaster.UI/Properties/Settings.settings

@@ -1,9 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="StringMaster.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="StringMaster.UI.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="DescriptionKeyFileName" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="MRUList" Type="System.Collections.Specialized.StringCollection" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>

src/StringMaster.UI/Resources/Icons.xaml

@@ -8,6 +8,7 @@
     <BitmapImage x:Key="TickToolBarIcon" UriSource="pack://application:,,,/StringMaster.UI;component/Resources/Icons/tick.png" />
     <BitmapImage x:Key="AddToolBarIcon" UriSource="pack://application:,,,/StringMaster.UI;component/Resources/Icons/add.png" />
     <BitmapImage x:Key="RemoveToolBarIcon" UriSource="pack://application:,,,/StringMaster.UI;component/Resources/Icons/remove.bmp" />
+    <BitmapImage x:Key="RemoveDisabledToolBarIcon" UriSource="pack://application:,,,/StringMaster.UI;component/Resources/Icons/remove - disabled.bmp" />
     <BitmapImage x:Key="ExecuteToolBarIcon" UriSource="pack://application:,,,/StringMaster.UI;component/Resources/Icons/execute.png" />
     <BitmapImage x:Key="LayerOnImage" UriSource="pack://application:,,,/StringMaster.UI;component/Resources/Icons/on.png" />
     <BitmapImage x:Key="LayerOffImage" UriSource="pack://application:,,,/StringMaster.UI;component/Resources/Icons/off.png" />

src/StringMaster.UI/StringMaster.UI.csproj

@@ -40,6 +40,9 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -133,6 +136,8 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>ResourceStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -247,6 +252,8 @@
   <ItemGroup>
     <Resource Include="Resources\Icons\unlocked.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Resources\Icons\remove - disabled.bmp" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/StringMaster.UI/ViewModels/StringCogoPointsViewModel.cs

@@ -28,6 +28,8 @@ public class StringCogoPointsViewModel : ObservableObject
     private ObservableCollection<DescriptionKey> _unchangedDescriptionKeys;
     private string _currentFileName;
     private DescriptionKey _selectedKey;
+    private ObservableCollection<string> _mruList;
+
 
     public IAcadColorDialogService ACADColorDialogService { get; }
 
@@ -55,6 +57,23 @@ public DescriptionKey SelectedKey
         set => SetProperty(ref _selectedKey, value);
     }
 
+    public ObservableCollection<string> MRUList
+    {
+        get => _mruList;
+        set => SetProperty(ref _mruList, value);
+    }
+
+    public bool IsDescriptionKeyLoaded
+    {
+        get
+        {
+            if (MRUList == null || MRUList.Count == 0)
+                return false;
+            else
+                return true;
+        }
+    }
+
     public ICommand NewDescriptionKeyFileCommand { get; }
     public ICommand OpenDescriptionKeyFileCommand { get; }
     public ICommand SaveDescriptionKeyFileCommand { get; }
@@ -65,6 +84,8 @@ public DescriptionKey SelectedKey
     public ICommand CopyRowCommand { get; }
     public ICommand StringCommand { get; }
     public ICommand LayerSelectCommand { get; }
+    public ICommand MRUListSelectionChanged { get; }
+    public ICommand UnloadDescriptionKeyCommand { get; }
 
     public StringCogoPointsViewModel(IOpenDialogService openDialogService,
                                      ISaveDialogService saveDialogService,
@@ -110,7 +131,10 @@ public DescriptionKey SelectedKey
                                                                  DescriptionKeys.Count > 0 &&
                                                                  DescriptionKeys.All(x => x.IsValid));
         LayerSelectCommand = new RelayCommand(ShowLayerSelectionDialog);
+        MRUListSelectionChanged = new RelayCommand(SelectionChanged);
+        UnloadDescriptionKeyCommand = new RelayCommand(UnloadDescriptionKeyFile);
 
+        LoadMRUList();
         LoadSettingsFromFile(Properties.Settings.Default.DescriptionKeyFileName);
     }
 
@@ -260,7 +284,10 @@ private void UnhookPropertyChangeEvents()
     private void LoadSettingsFromFile(string fileName)
     {
         if (string.IsNullOrEmpty(fileName) || !File.Exists(fileName))
+        {
+            DescriptionKeys = new ObservableCollection<DescriptionKey>();
             return;
+        }
 
         DescriptionKeys.CollectionChanged -= DescriptionKeysOnCollectionChanged;
         UnhookPropertyChangeEvents();
@@ -294,6 +321,8 @@ private void LoadSettingsFromFile(string fileName)
         IsUnsavedChanges = false;
         Properties.Settings.Default.DescriptionKeyFileName = fileName;
         Properties.Settings.Default.Save();
+        AddToMRUList(fileName);
+        SaveMRUList();
     }
 
     /// <summary>
@@ -410,4 +439,50 @@ private void OpenDescriptionKeyFile()
         CurrentFileName = _openDialogService.FileName;
         LoadSettingsFromFile(CurrentFileName);
     }
+
+
+    private void UnloadDescriptionKeyFile()
+    {
+        MRUList.Remove(CurrentFileName);
+
+        if (MRUList.Count > 0)
+            CurrentFileName = MRUList[MRUList.Count - 1];
+
+        SaveMRUList();
+
+        NotifyPropertyChanged(nameof(IsDescriptionKeyLoaded));
+    }
+
+
+    // MRU list
+    private void AddToMRUList(string fileName)
+    {
+        if (string.IsNullOrEmpty(fileName))
+            return;
+
+        if (MRUList.Contains(fileName))
+            return;
+
+        MRUList.Add(fileName);
+    }
+
+    private void LoadMRUList()
+    {
+        MRUList = Properties.Settings.Default.MRUList != null
+            ? new ObservableCollection<string>(Properties.Settings.Default.MRUList.Cast<string>().ToList())
+            : new ObservableCollection<string>();
+    }
+
+    private void SaveMRUList()
+    {
+        Properties.Settings.Default.MRUList = new StringCollection();
+        Properties.Settings.Default.MRUList.AddRange(MRUList.ToArray());
+        Properties.Settings.Default.Save();
+    }
+
+    private void SelectionChanged()
+    {
+        LoadSettingsFromFile(CurrentFileName);
+        NotifyPropertyChanged(nameof(IsDescriptionKeyLoaded));
+    }
 }

src/StringMaster.UI/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="StringMaster.UI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <StringMaster.UI.Properties.Settings>
+            <setting name="DescriptionKeyFileName" serializeAs="String">
+                <value />
+            </setting>
+        </StringMaster.UI.Properties.Settings>
+    </userSettings>
+</configuration>

src/StringMaster.UI/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net47" />
+</packages>