Merge pasting states and .dmi links into Ctrl+V

space-wizards · Jan 30, 2024 · c5f2143 · c5f2143
1 parent 46873ad
commit c5f2143
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/Editor/ViewModels/MainWindowViewModel.cs b/Editor/ViewModels/MainWindowViewModel.cs
@@ -30,6 +30,8 @@ namespace Editor.ViewModels;
 
 public class MainWindowViewModel : ViewModelBase
 {
+    private const string StatesClipboard = "RSIEdit_States";
+
     private static readonly GifDecoder GifDecoder = new();
     private static readonly PngDecoder PngDecoder = new();
     private static readonly HttpClient Http = new();
@@ -108,12 +110,6 @@ public bool IsRsiOpen
         set => this.RaiseAndSetIfChanged(ref _isRsiOpen, value);
     }
 
-    public bool HasCopiedStates
-    {
-        get => _hasCopiedStates;
-        set => this.RaiseAndSetIfChanged(ref _hasCopiedStates, value);
-    }
-
     public Interaction<Unit, bool> NewRsiAction { get; } = new();
 
     public Interaction<Unit, string?> OpenRsiDialog { get; } = new();
@@ -309,12 +305,18 @@ public void Close()
 
     public async Task Paste()
     {
-        if (Application.Current?.Clipboard?.GetTextAsync() is not { } task)
+        if (Application.Current?.Clipboard is not { } clipboard)
+            return;
+
+        var text = await clipboard.GetTextAsync();
+        if (text == StatesClipboard)
+        {
+            await PasteStates();
             return;
+        }
 
-        var clipboard = await task;
-        if (string.IsNullOrWhiteSpace(clipboard) ||
-            !Uri.TryCreate(clipboard, UriKind.Absolute, out var url) ||
+        if (string.IsNullOrWhiteSpace(text) ||
+            !Uri.TryCreate(text, UriKind.Absolute, out var url) ||
             !ValidDownloadHosts.Contains(url.Host))
         {
             return;
@@ -337,7 +339,7 @@ public async Task Paste()
             return;
 
         var stream = await downloadResponse.Content.ReadAsStreamAsync();
-        var rsi = await LoadDmi(stream, clipboard);
+        var rsi = await LoadDmi(stream, text);
         if (rsi == null)
             return;
 
@@ -535,10 +537,13 @@ public async void OpenPreferences()
 
     #region Edit
 
-    public void CopyStates()
+    public async Task CopyStates()
     {
         if (CurrentOpenRsi?.SelectedStates.Count > 0)
         {
+            if (Application.Current?.Clipboard is { } clipboard)
+                await clipboard.SetTextAsync(StatesClipboard);
+
             _copiedStates.Clear();
             foreach (var state in CurrentOpenRsi.SelectedStates)
             {
@@ -548,12 +553,10 @@ public void CopyStates()
 
             _copiedLicense = CurrentOpenRsi.License;
             _copiedCopyright = CurrentOpenRsi.Copyright;
-
-            HasCopiedStates = true;
         }
     }
 
-    public async Task PasteStates()
+    private async Task PasteStates()
     {
         if (CurrentOpenRsi != null)
         {

diff --git a/Editor/Views/MainWindow.axaml b/Editor/Views/MainWindow.axaml
@@ -34,8 +34,6 @@
                     Command="{Binding Delete}"/>
         <KeyBinding Gesture="Ctrl+C"
                     Command="{Binding CopyStates}"/>
-        <KeyBinding Gesture="Ctrl+Shift+V"
-                    Command="{Binding PasteStates}"/>
         <KeyBinding Gesture="Ctrl+Z"
                     Command="{Binding Undo}"/>
         <KeyBinding Gesture="Ctrl+Y"
@@ -68,7 +66,7 @@
             </MenuItem>
             <MenuItem Header="_Edit">
                 <MenuItem Header="_Copy States" IsEnabled="{Binding IsRsiOpen}" Command="{Binding CopyStates}" InputGesture="Ctrl+C"/>
-                <MenuItem Header="_Paste States" IsEnabled="{Binding HasCopiedStates}" Command="{Binding PasteStates}" InputGesture="Ctrl+Shift+V"/>
+                <MenuItem Header="_Paste States or .dmi Link" Command="{Binding Paste}" InputGesture="Ctrl+V"/>
                 <MenuItem Header="_Undo" IsEnabled="{Binding IsRsiOpen}" Command="{Binding Undo}" InputGesture="Ctrl+Z"/>
                 <MenuItem Header="_Redo" IsEnabled="{Binding IsRsiOpen}" Command="{Binding Redo}" InputGesture="Ctrl+Y"/>
                 <Separator/>