From 24bbfcc4139596ac6d3929da44e353508f426974 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 7 Apr 2025 14:27:33 +0800
Subject: [PATCH] Support numerical box for priority

---
 Flow.Launcher/PriorityChangeWindow.xaml       | 121 ------------------
 Flow.Launcher/PriorityChangeWindow.xaml.cs    |  67 ----------
 .../Controls/InstalledPluginDisplay.xaml      |   3 +-
 Flow.Launcher/ViewModel/PluginViewModel.cs    |  20 +--
 4 files changed, 4 insertions(+), 207 deletions(-)
 delete mode 100644 Flow.Launcher/PriorityChangeWindow.xaml
 delete mode 100644 Flow.Launcher/PriorityChangeWindow.xaml.cs

diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
deleted file mode 100644
index 33ed54bb4..000000000
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ /dev/null
@@ -1,121 +0,0 @@
-<Window
-    x:Class="Flow.Launcher.PriorityChangeWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:Flow.Launcher"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
-    Title="{DynamicResource changePriorityWindow}"
-    Width="350"
-    Background="{DynamicResource PopuBGColor}"
-    Foreground="{DynamicResource PopupTextColor}"
-    Loaded="PriorityChangeWindow_Loaded"
-    MouseDown="window_MouseDown"
-    ResizeMode="NoResize"
-    SizeToContent="Height"
-    WindowStartupLocation="CenterScreen"
-    mc:Ignorable="d">
-    <WindowChrome.WindowChrome>
-        <WindowChrome CaptionHeight="32" ResizeBorderThickness="{x:Static SystemParameters.WindowResizeBorderThickness}" />
-    </WindowChrome.WindowChrome>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="80" />
-        </Grid.RowDefinitions>
-
-        <StackPanel Grid.Row="0">
-            <StackPanel>
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Button
-                        Grid.Column="1"
-                        Click="BtnCancel_OnClick"
-                        Style="{StaticResource TitleBarCloseButtonStyle}">
-                        <Path
-                            Width="46"
-                            Height="32"
-                            Data="M 18,11 27,20 M 18,20 27,11"
-                            Stroke="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Button}}}"
-                            StrokeThickness="1">
-                            <Path.Style>
-                                <Style TargetType="Path">
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding Path=IsActive, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Value="False">
-                                            <Setter Property="Opacity" Value="0.5" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Path.Style>
-                        </Path>
-                    </Button>
-                </Grid>
-            </StackPanel>
-            <StackPanel Margin="26,12,26,0">
-                <StackPanel Margin="0,0,0,12">
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,0,0"
-                        FontSize="20"
-                        FontWeight="SemiBold"
-                        Text="{DynamicResource changePriorityWindow}"
-                        TextAlignment="Left" />
-                </StackPanel>
-                <StackPanel>
-                    <TextBlock
-                        FontSize="14"
-                        Text="{DynamicResource priority_tips}"
-                        TextAlignment="Left"
-                        TextWrapping="WrapWithOverflow" />
-                </StackPanel>
-
-                <StackPanel Margin="0,24,0,24" Orientation="Horizontal">
-                    <TextBlock
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource priority}" />
-                    <ui:NumberBox
-                        x:Name="tbAction"
-                        Width="200"
-                        Maximum="100"
-                        Minimum="-100"
-                        Margin="10,0,15,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        CornerRadius="4"
-                        SmallChange="1"
-                        SpinButtonPlacementMode="Inline" />
-                </StackPanel>
-            </StackPanel>
-        </StackPanel>
-        <Border
-            Grid.Row="1"
-            Background="{DynamicResource PopupButtonAreaBGColor}"
-            BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                <Button
-                    x:Name="btnCancel"
-                    Width="145"
-                    Height="30"
-                    Margin="0,0,5,0"
-                    Click="BtnCancel_OnClick"
-                    Content="{DynamicResource cancel}" />
-                <Button
-                    x:Name="btnDone"
-                    Width="145"
-                    Height="30"
-                    Margin="5,0,0,0"
-                    Click="btnDone_OnClick"
-                    Style="{StaticResource AccentButtonStyle}">
-                    <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
-                </Button>
-            </StackPanel>
-        </Border>
-    </Grid>
-</Window>
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml.cs b/Flow.Launcher/PriorityChangeWindow.xaml.cs
deleted file mode 100644
index fbe2a941d..000000000
--- a/Flow.Launcher/PriorityChangeWindow.xaml.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using Flow.Launcher.Core.Plugin;
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Plugin;
-using Flow.Launcher.ViewModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Flow.Launcher.Core;
-
-namespace Flow.Launcher
-{
-    /// <summary>
-    /// Interaction Logic of PriorityChangeWindow.xaml
-    /// </summary>
-    public partial class PriorityChangeWindow : Window
-    {
-        private readonly PluginPair plugin;
-        private readonly Internationalization translater = InternationalizationManager.Instance;
-        private readonly PluginViewModel pluginViewModel;
-        public PriorityChangeWindow(string pluginId, PluginViewModel pluginViewModel)
-        {
-            InitializeComponent();
-            plugin = PluginManager.GetPluginForId(pluginId);
-            this.pluginViewModel = pluginViewModel;
-            if (plugin == null)
-            {
-                App.API.ShowMsgBox(translater.GetTranslation("cannotFindSpecifiedPlugin"));
-                Close();
-            }
-        }
-
-        private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
-        {
-            Close();
-        }
-
-        private void btnDone_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (int.TryParse(tbAction.Text.Trim(), out var newPriority))
-            {
-                pluginViewModel.ChangePriority(newPriority);
-                Close();
-            }
-            else
-            {
-                string msg = translater.GetTranslation("invalidPriority");
-                App.API.ShowMsgBox(msg);
-            }
-
-        }
-
-        private void PriorityChangeWindow_Loaded(object sender, RoutedEventArgs e)
-        {
-            tbAction.Text = pluginViewModel.Priority.ToString();
-            tbAction.Focus();
-        }
-        private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
-        {
-            TextBox textBox = Keyboard.FocusedElement as TextBox;
-            if (textBox != null)
-            {
-                TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next);
-                textBox.MoveFocus(tRequest);
-            }
-        }
-    }
-}
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
index 5ba011fed..778f00160 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplay.xaml
@@ -70,7 +70,8 @@
                                 Maximum="999"
                                 Minimum="-999"
                                 SpinButtonPlacementMode="Inline"
-                                ToolTip="{DynamicResource priorityToolTip}" />
+                                ToolTip="{DynamicResource priorityToolTip}"
+                                Value="{Binding Priority, Mode=TwoWay}" />
                         </StackPanel>
 
                         <StackPanel
diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModel/PluginViewModel.cs
index bf61b1902..22a69592b 100644
--- a/Flow.Launcher/ViewModel/PluginViewModel.cs
+++ b/Flow.Launcher/ViewModel/PluginViewModel.cs
@@ -88,10 +88,8 @@ namespace Flow.Launcher.ViewModel
             get => PluginPair.Metadata.Priority;
             set
             {
-                if (PluginPair.Metadata.Priority != value)
-                {
-                    ChangePriority(value);
-                }
+                PluginPair.Metadata.Priority = value;
+                PluginSettingsObject.Priority = value;
             }
         }
 
@@ -151,20 +149,6 @@ namespace Flow.Launcher.ViewModel
             OnPropertyChanged(nameof(SearchDelayTimeText));
         }
 
-        public void ChangePriority(int newPriority)
-        {
-            PluginPair.Metadata.Priority = newPriority;
-            PluginSettingsObject.Priority = newPriority;
-            OnPropertyChanged(nameof(Priority));
-        }
-
-        [RelayCommand]
-        private void EditPluginPriority()
-        {
-            var priorityChangeWindow = new PriorityChangeWindow(PluginPair. Metadata.ID, this);
-            priorityChangeWindow.ShowDialog();
-        }
-
         [RelayCommand]
         private void OpenPluginDirectory()
         {