feat: Update layout and add clear cache command.

Author: rabbitism

GeMS-Key-Plus/GeMS-Key-Plus/GeMS-Key-Plus.csproj

@@ -5,6 +5,10 @@
     <TargetFramework>netcoreapp5.0</TargetFramework>
     <RootNamespace>GeMS_Key_Plus</RootNamespace>
     <UseWPF>true</UseWPF>
+    <Version>0.1.0</Version>
+    <Authors>Rabbitism</Authors>
+    <Company>Galaxism</Company>
+    <Product>GEMS Key Plus</Product>
   </PropertyGroup>
 
   <ItemGroup>

GeMS-Key-Plus/GeMS-Key-Plus/MainWindow.xaml

@@ -14,7 +14,6 @@
         SizeToContent="WidthAndHeight"
         AllowsTransparency="True"
         FontSize="16"
-        WindowStartupLocation="CenterScreen"
         d:DataContext="{x:Type vms:MainViewModel}"
         Title="GeMS Key Plus" d:DesignHeight="450" d:DesignWidth="800">
     <materialDesign:Card Margin="2" Background="White" Opacity="0.95">
@@ -71,7 +70,11 @@
                             >
 
                         </TextBox>
-                        <materialDesign:PopupBox Grid.Column="1" Padding="8" IsTabStop="False" StaysOpen="True">
+                        <materialDesign:PopupBox 
+                            Grid.Column="1" 
+                            Padding="8" 
+                            IsTabStop="False" 
+                            StaysOpen="True">
                             <i:Interaction.Triggers>
                                 <i:EventTrigger EventName="Opened">
                                     <i:InvokeCommandAction Command="{Binding ReloadActionHistoryCommand}" ></i:InvokeCommandAction>
@@ -87,12 +90,26 @@
                             </materialDesign:PopupBox.ToggleContent>
 
                             <StackPanel>
-                                <Grid>
-                                    
+                                <Grid Margin="16 8 16 0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="History"></TextBlock>
+                                    <Button 
+                                        Style="{StaticResource MaterialDesignToolForegroundButton}"
+                                        Grid.Column="1"
+                                        Command="{Binding ClearCacheCommand}"
+                                    >
+                                        <materialDesign:PackIcon 
+                                            Kind="Eraser" 
+                                            ></materialDesign:PackIcon>
+                                    </Button>
                                 </Grid>
                                 <ListView 
                                     ItemsSource="{Binding ActionHistory}"
-                                    Width="600"
+                                    MaxWidth="600"
+                                    MinWidth="200"
                                     MaxHeight="600"
                                     SelectedItem="{Binding SelectedActionRecord}"
                                     ScrollViewer.VerticalScrollBarVisibility="Auto"

GeMS-Key-Plus/GeMS-Key-Plus/Models/LRUCache.cs

@@ -59,6 +59,12 @@ public IEnumerable<Tuple<TKey, TValue>> GetAll()
             }
         }
 
+        public void Clear()
+        {
+            _list.Clear();
+            _nodeDictionary.Clear();
+            _dictionary.Clear();
+        }
 
     }
 }

GeMS-Key-Plus/GeMS-Key-Plus/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\netcoreapp5.0\publish\</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <SelfContained>false</SelfContained>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+  </PropertyGroup>
+</Project>

GeMS-Key-Plus/GeMS-Key-Plus/ViewModels/MainViewModel.cs

@@ -22,6 +22,7 @@ public class MainViewModel:BindableBase
         public DelegateCommand ReloadActionHistoryCommand { get; set; }
         public DelegateCommand<ActionRecordViewModel> QueryHistoryCommand { get; set; }
         public DelegateCommand ReloadButtonsCommand { get; set; }
+        public DelegateCommand ClearCacheCommand { get; set; }
 
         private string _queryString;
         public string QueryString {
@@ -94,6 +95,7 @@ public MainViewModel()
             ReloadActionHistoryCommand = new DelegateCommand(ReloadActionHistory);
             QueryHistoryCommand = new DelegateCommand<ActionRecordViewModel>(QueryHistory);
             ReloadButtonsCommand = new DelegateCommand(ReloadButtons);
+            ClearCacheCommand = new DelegateCommand(ClearCache);
         }
 
         public void Query(KeyEventArgs args)
@@ -124,6 +126,12 @@ private void QueryHistory(ActionRecordViewModel record)
                 this.ButtonPanel.Query(key);
             }
         }
+
+        private void ClearCache()
+        {
+            GlobalVariables.ActionHistory.Clear();
+            ReloadActionHistory();
+        }
 
     }
 }

GeMS-Key-Plus/GeMS-Key-Plus/ViewModels/SettingViewModel.cs

@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace GeMS_Key_Plus.ViewModels
@@ -26,6 +27,16 @@ public LinkButtonViewModel NewButton {
             } 
         }
 
+        private LinkButton _selectedButton = new LinkButton();
+
+        public LinkButton SelectedButton {
+            get => _selectedButton;
+            set {
+                _selectedButton = value;
+                RaisePropertyChanged(nameof(SelectedButton));
+            }
+        }
+
         private ObservableCollection<string> _availableKeys;
 
         public ObservableCollection<string> AvailableKeys {
@@ -50,11 +61,13 @@ public ObservableCollection<LinkButton> Buttons {
         }
 
         public DelegateCommand SubmitCommand { get; set; }
+        public DelegateCommand<int?> DeleteCommand { get; set; }
 
         public SettingViewModel()
         {
             ReloadButtons();
             SubmitCommand = new DelegateCommand(SubmitNewButton);
+            DeleteCommand = new DelegateCommand<int?>(DeleteButton);
         }
 
         private void ReloadButtons()
@@ -99,5 +112,18 @@ private void SubmitNewButton()
             ReloadButtons();
             this.NewButton = new LinkButtonViewModel();
         }
+
+        private void DeleteButton(int? i)
+        {
+            if (!i.HasValue) return;
+            using (ApplicationContext context = new ApplicationContext())
+            {
+                LinkButton b = context.Buttons.FirstOrDefault(a => a.Id == i);
+                if (b is null) return;
+                context.Remove(b);
+                context.SaveChanges();
+            }
+            ReloadButtons();
+        }
     }
 }

GeMS-Key-Plus/GeMS-Key-Plus/Views/Setting.xaml

@@ -31,7 +31,17 @@
                     <materialDesign:PackIcon Kind="Close"></materialDesign:PackIcon>
                 </Button>
             </Grid>
-            <ListView ItemsSource="{Binding Buttons}">
+            <ListView 
+                ItemsSource="{Binding Buttons}"
+                SelectedItem="{Binding SelectedButton}"
+                >
+                <ListView.ContextMenu>
+                    <ContextMenu >
+                        <MenuItem Header="Delete" Command="{Binding DeleteCommand}" CommandParameter="{Binding SelectedButton.Id}">
+                            
+                        </MenuItem>
+                    </ContextMenu>
+                </ListView.ContextMenu>
                 <ListView.View>
                     <GridView>
                         <GridViewColumn 

GeMS-Key-Plus/GeMS-Key-Plus/Views/Setting.xaml.cs

@@ -1,6 +1,7 @@
 using GeMS_Key_Plus.ViewModels;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -31,13 +32,14 @@ public Setting()
         public Setting(MainViewModel mainViewModel)
         {
             InitializeComponent();
-            _mainViewModel = new MainViewModel();
+            _mainViewModel = mainViewModel;
             this.DataContext = new SettingViewModel();
         }
 
         private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
-            _mainViewModel?.ReloadButtonsCommand?.Execute();
+            _mainViewModel.ReloadButtonsCommand.Execute();
+            Debug.WriteLine("Close Settings");
             this.Close();
         }