From 899d46a99709849197bd9cf98419498911d23949 Mon Sep 17 00:00:00 2001
From: Nate Bross <nate@brosstribe.com>
Date: Wed, 28 Feb 2024 20:15:42 -0600
Subject: [PATCH] fix: reorganize menu items

---
 MainWindow.axaml                  | 24 ++++++++++++++++++------
 ViewModels/MainWindowViewModel.cs | 14 ++++++++++++--
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/MainWindow.axaml b/MainWindow.axaml
index 5b69ed6..aa3fce5 100644
--- a/MainWindow.axaml
+++ b/MainWindow.axaml
@@ -19,30 +19,41 @@
     <DockPanel>
         <Menu DockPanel.Dock="Top">
             <MenuItem Header="_File">
-                <MenuItem Command="{Binding NewEmptyItem}" Header="_New" />
+                <MenuItem Header="_New">
+                    <MenuItem Command="{Binding NewEmptyItem}" Header="Blank Clip" />
+                    <MenuItem Command="{Binding PasteFileMakerClipData}" Header="From Clipboard (copied from FileMaker)" />
+                </MenuItem>
                 <Separator />
                 <MenuItem Command="{Binding OpenFolderPicker}" Header="Open Folder" />
                 <Separator />
-                <MenuItem Command="{Binding SaveClipsStorage}" Header="Save All" />
+                <MenuItem Header="Save">
+                    <MenuItem Command="{Binding SaveClipsStorage}" Header="Save All To Folder" />
+                    <MenuItem Command="{Binding CopySelectedToClip}" Header="Selected clip to Clipboard (to paste into FileMaker)" />
+                </MenuItem>
                 <Separator />
                 <MenuItem Command="{Binding ExitApplication}" Header="_Exit" />
             </MenuItem>
-            <MenuItem Header="_Edit">
-                <MenuItem Command="{Binding CopySelectedToClip}" Header="Copy as FileMaker Blob" />
-                <MenuItem Command="{Binding PasteFileMakerClipData}" Header="Paste From FileMaker Blob" />
-            </MenuItem>
             <MenuItem Header="Transform">
                 <MenuItem Command="{Binding CopyAsClass}" Header="Copy as C# Class" />
             </MenuItem>
             <MenuItem Header="{Binding Version}" />
         </Menu>
         <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="225" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
+            <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,8">
+                <TextBox Text="{Binding CurrentPath, Mode=OneWay}" />
+            </StackPanel>
+
             <ListBox
+                Grid.Row="1"
                 Grid.Column="0"
                 ItemsSource="{Binding FileMakerClips}"
                 SelectedItem="{Binding SelectedClip}">
@@ -63,6 +74,7 @@
 
             <AvaloniaEdit:TextEditor
                 x:Name="avaloniaEditor"
+                Grid.Row="1"
                 Grid.Column="1"
                 FontFamily="Cascadia Code,Consolas,Menlo,Monospace"
                 ShowLineNumbers="True"
diff --git a/ViewModels/MainWindowViewModel.cs b/ViewModels/MainWindowViewModel.cs
index 9d3a0d0..8128536 100644
--- a/ViewModels/MainWindowViewModel.cs
+++ b/ViewModels/MainWindowViewModel.cs
@@ -20,8 +20,6 @@ public partial class MainWindowViewModel : INotifyPropertyChanged
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
-    public string? CurrentPath = null;
-
     private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
     {
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
@@ -238,4 +236,16 @@ public ClipViewModel? SelectedClip
             NotifyPropertyChanged();
         }
     }
+
+    private string _currentPath;
+    public string CurrentPath
+    {
+        get => _currentPath;
+        set
+        {
+            _currentPath = value;
+            NotifyPropertyChanged();
+        }
+    }
+
 }
\ No newline at end of file