Merge pull request #954 from shananas/MoveSelectedModTop

Move Selected Mod Top Button
OpenKH · Dec 22, 2023 · ca18d8a · ca18d8a
2 parents 6b261af + bc1f208
commit ca18d8a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/MainViewModel.cs
@@ -75,6 +75,7 @@ public class MainViewModel : BaseNotifyPropertyChanged, IChangeModEnableState
         public RelayCommand AddModCommand { get; set; }
         public RelayCommand RemoveModCommand { get; set; }
         public RelayCommand OpenModFolderCommand { get; set; }
+        public RelayCommand MoveTop { get; set; }
         public RelayCommand MoveUp { get; set; }
         public RelayCommand MoveDown { get; set; }
         public RelayCommand BuildCommand { get; set; }
@@ -392,6 +393,7 @@ await ModsService.InstallMod(name, isZipFile, isLuaFile, progress =>
                     UseShellExecute = true
                 });
             }, _ => IsModSelected);
+            MoveTop = new RelayCommand(_ => MoveSelectedModTop(), _ => CanSelectedModMoveUp());
             MoveUp = new RelayCommand(_ => MoveSelectedModUp(), _ => CanSelectedModMoveUp());
             MoveDown = new RelayCommand(_ => MoveSelectedModDown(), _ => CanSelectedModMoveDown());
             BuildCommand = new RelayCommand(async _ =>
@@ -702,6 +704,18 @@ private void MoveSelectedModUp()
             SelectedValue = ModsList[selectedIndex];
             ModEnableStateChanged();
         }
+        private void MoveSelectedModTop()
+        {
+            var selectedIndex = ModsList.IndexOf(SelectedValue);
+            if (selectedIndex < 0)
+                return;
+
+            var item = ModsList[selectedIndex];
+            ModsList.RemoveAt(selectedIndex);
+            ModsList.Insert(selectedIndex = 0, item);
+            SelectedValue = ModsList[selectedIndex];
+            ModEnableStateChanged();
+        }
 
         private async Task PatchGame(bool fastMode)
         {

diff --git a/OpenKh.Tools.ModsManager/ViewModels/ModViewModel.cs b/OpenKh.Tools.ModsManager/ViewModels/ModViewModel.cs
@@ -17,6 +17,7 @@ namespace OpenKh.Tools.ModsManager.ViewModels
 {
     public class ModViewModel : BaseNotifyPropertyChanged
     {
+        public ColorThemeService ColorTheme => ColorThemeService.Instance;
         private static readonly string FallbackImage = null;
         private readonly ModModel _model;
         private readonly IChangeModEnableState _changeModEnableState;

diff --git a/OpenKh.Tools.ModsManager/Views/MainWindow.xaml b/OpenKh.Tools.ModsManager/Views/MainWindow.xaml
@@ -85,7 +85,7 @@
                 <MenuItem Header="Auto Update Mods" IsCheckable="True" ToolTip="When enabled Mod Manager will automatically update all mods on startup." IsChecked="{Binding AutoUpdateMods}" StaysOpenOnClick="True"/>
                 <MenuItem Header="Check for update" Command="{Binding CheckOpenkhUpdateCommand}"/>
                 <MenuItem Header="Check Mods for Updates" Command="{Binding CheckForModUpdatesCommand}"/>
-                <MenuItem Header="DarkMode" IsCheckable="True" IsChecked="{Binding ColorTheme.DarkMode}" StaysOpenOnClick="True"/>
+                <MenuItem Header="Dark Mode" IsCheckable="True" IsChecked="{Binding ColorTheme.DarkMode}" StaysOpenOnClick="True"/>
                 <MenuItem Header="Panacea Settings" Visibility="{Binding PanaceaSettings}">
                     <MenuItem Header="Enable Console" IsCheckable="True" IsChecked="{Binding PanaceaConsoleEnabled}" StaysOpenOnClick="True"/>
                     <MenuItem Header="Enable Debug Log" IsCheckable="True" IsChecked="{Binding PanaceaDebugLogEnabled}" IsEnabled="{Binding PanaceaConsoleEnabled}" StaysOpenOnClick="True"/>

diff --git a/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml b/OpenKh.Tools.ModsManager/Views/ModDetailsView.xaml
@@ -9,10 +9,10 @@
     <UserControl.Resources>
         <SolidColorBrush x:Key="textHyperlink" Color="#569CD6" />
         <Style TargetType="TextBlock">
-            <Setter Property="Foreground" Value="{Binding ColorThemeService.TextColor}"/>
+            <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
         </Style>
         <Style TargetType="Expander">
-            <Setter Property="Foreground" Value="{Binding ColorThemeService.TextColor}"/>
+            <Setter Property="Foreground" Value="{Binding ColorTheme.TextColor}"/>
         </Style>
     </UserControl.Resources>
     <StackPanel Background="{Binding BackgroundColor}">

diff --git a/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml b/OpenKh.Tools.ModsManager/Views/ModManagerView.xaml
@@ -77,6 +77,18 @@
         </ListBox>
         <Grid Grid.Column="1">
             <StackPanel VerticalAlignment="Center">
+                <Button Grid.Row="0" Margin="0 3 0 3" Command="{Binding MoveTop}" ToolTip="Moves Selected mod to the top.">
+                    <Image Source="{StaticResource ExpandChevronRightGroup_16x}" RenderTransformOrigin="0.5,0.5">
+                        <Image.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="-90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Image.RenderTransform>
+                    </Image>
+                </Button>
                 <Button Grid.Row="0" Margin="0 3 0 3" Command="{Binding MoveUp}" ToolTip="Moves selected mod up increasing its priority.">
                     <Image Source="{StaticResource AddRowToAbove_16x}"/>
                 </Button>