Ctrl Space for next set

ImoutoChan · Sep 6, 2024 · a114e2b · a114e2b
1 parent 20f69cd
commit a114e2b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/Source/ImoutoRebirth.Navigator/ImoutoRebirth.Navigator/App.xaml.cs b/Source/ImoutoRebirth.Navigator/ImoutoRebirth.Navigator/App.xaml.cs
@@ -16,6 +16,7 @@ public App() => Startup += async (_, _) =>
         catch (Exception e)
         {
             Log.Error(e, "Error during application startup");
+            Application.Current.Shutdown();
         }
     };
 
@@ -39,7 +40,7 @@ protected override void OnStartup(StartupEventArgs startupEventArgs)
     {
         Log.Logger = new LoggerConfiguration()
             .MinimumLevel.Debug()
-            .WriteTo.Console() 
+            .WriteTo.Console()
             .WriteTo.File("logs/log.txt", rollingInterval: RollingInterval.Day, retainedFileCountLimit: 10)
             .Enrich.WithThreadId()
             .Enrich.WithThreadName()

diff --git a/...oRebirth.Navigator/ImoutoRebirth.Navigator/Slices/QuickTagging/AvailableTagPacksSetsVM.cs b/...oRebirth.Navigator/ImoutoRebirth.Navigator/Slices/QuickTagging/AvailableTagPacksSetsVM.cs
@@ -2,6 +2,7 @@
 using System.Text.Json;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using ImoutoRebirth.Common;
 using ImoutoRebirth.Navigator.Services.Tags.Model;
 
@@ -53,15 +54,12 @@ private void Load()
 
         foreach (var set in savedSets) 
             Sets.Add(set);
+    }
 
-        //foreach (var savedSet in savedSets.Where(x => x.Packs.Any(y => y.Any())))
-        //{
-        //    var set = new TagsPacksSetVM();
-        //    set.
-        //    foreach (var pack in savedSet.Packs.Where(x => x.Any())) 
-        //        set.AddNext(pack);
-
-        //    Sets.Add(set);
-        //}
+    [RelayCommand]
+    private void SelectNext()
+    {
+        var index = Sets.IndexOf(Selected);
+        Selected = index == Sets.Count - 1 ? Sets.First() : Sets[index + 1];
     }
 }
diff --git a/...ImoutoRebirth.Navigator/ImoutoRebirth.Navigator/Slices/QuickTagging/QuickTaggingView.xaml b/...ImoutoRebirth.Navigator/ImoutoRebirth.Navigator/Slices/QuickTagging/QuickTaggingView.xaml
@@ -147,14 +147,16 @@
                     </ItemsControl.ItemContainerStyle>
                 </ItemsControl>
 
-                <TextBlock Grid.Row="2" Height="65">
+                <TextBlock Grid.Row="2" Height="85">
                     <Run Text="CTRL + ↵  | Apply Selected" />
                     <LineBreak />
                     <Run Text="CTRL + → | Create pack" />
                     <LineBreak />
                     <Run Text="CTRL + X  | Clear selected" />
                     <LineBreak />
                     <Run Text="CTRL + SHIFT + X | Clear quick apply" />
+                    <LineBreak />
+                    <Run Text="CTRL + SPACE | Next set" />
                 </TextBlock>
             </Grid>
 

diff --git a/...utoRebirth.Navigator/ImoutoRebirth.Navigator/Slices/QuickTagging/QuickTaggingView.xaml.cs b/...utoRebirth.Navigator/ImoutoRebirth.Navigator/Slices/QuickTagging/QuickTaggingView.xaml.cs
@@ -92,6 +92,13 @@ private async void QuickTaggingView_OnPreviewKeyDown(object sender, KeyEventArgs
             e.Handled = true;
         }
 
+        // select next pack set
+        if (e.Key is Key.Space && Keyboard.Modifiers.HasFlag(ModifierKeys.Control))
+        {
+            DataContextVM.AvailableTagPacksSets.SelectNextCommand.Execute(null);
+            e.Handled = true;
+        }
+
         // apply packs
         if (Keyboard.Modifiers.HasFlag(ModifierKeys.Control))
         {