From 2e1cc7ee3cc0b788fa27c8fba0a3e832ec22dd72 Mon Sep 17 00:00:00 2001
From: BookerLiu <booker_liu@163.com>
Date: Fri, 21 Apr 2023 21:56:49 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96UI,=20=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=E5=85=AC=E5=85=B1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Control/UserControls/Config/AboutControl.xaml |  4 +--
 .../UserControls/Config/MotionControl.xaml    | 34 ++++++++++++-------
 Control/UserControls/Config/OtherControl.xaml | 28 +++++++--------
 Control/UserControls/Config/ThemeControl.xaml |  8 ++---
 Control/Windows/ToDoInfoWindow.xaml           |  8 ++---
 MainWindow.xaml                               |  1 -
 MainWindow.xaml.cs                            | 17 +++++++---
 Resource/Dictionary/CommonStyle.xaml          | 29 ++++++++++++++++
 8 files changed, 87 insertions(+), 42 deletions(-)

diff --git a/Control/UserControls/Config/AboutControl.xaml b/Control/UserControls/Config/AboutControl.xaml
index 023b279..4bfd041 100644
--- a/Control/UserControls/Config/AboutControl.xaml
+++ b/Control/UserControls/Config/AboutControl.xaml
@@ -80,10 +80,10 @@
                 <!--<hc:UniformSpacingPanel Spacing="10" Visibility="Visible" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0">
                 <TextBlock Text="更新源:" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                 <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="Gitee"
+                         Style="{StaticResource MyRadioBtnStyle}" Content="Gitee"
                          IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=1}"/>
                 <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Content="GitHub" 
+                         Style="{StaticResource MyRadioBtnStyle}" Content="GitHub" 
                          IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=2}"/>
             </hc:UniformSpacingPanel>-->
             </StackPanel>
diff --git a/Control/UserControls/Config/MotionControl.xaml b/Control/UserControls/Config/MotionControl.xaml
index fca7ecc..78d5e80 100644
--- a/Control/UserControls/Config/MotionControl.xaml
+++ b/Control/UserControls/Config/MotionControl.xaml
@@ -63,27 +63,35 @@
                 <TextBlock Text="面板关闭方式" VerticalAlignment="Center"/>
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="失去焦点后"
+                <RadioButton Margin="10,0,0,0" 
+                             Style="{StaticResource MyRadioBtnStyle}"
+                          Content="失去焦点后"
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=1}"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Content="运行项目后" 
+
+                <RadioButton Margin="10,0,0,0" 
+                         Style="{StaticResource MyRadioBtnStyle}" Content="运行项目后" 
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=2}"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="手动关闭"
+                <RadioButton Margin="10,0,0,0" 
+                         Style="{StaticResource MyRadioBtnStyle}" Content="手动关闭"
                          IsChecked="{Binding AppHideType, Mode=TwoWay, Converter={StaticResource HideTypeConvert}, ConverterParameter=3}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10" Margin="0,10,0,0" Grid.ColumnSpan="4">
-                <TextBlock Text="搜索方式" VerticalAlignment="Center"/>
+                <TextBlock Text="搜索方式"
+                           VerticalAlignment="Center"
+                           />
             </hc:UniformSpacingPanel>
             <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="快捷键"
-                         IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=0}"/>
-                <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Content="按键即搜" 
-                         IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=1}"/>
+                <RadioButton Margin="10,0,0,0"  
+                             hc:Poptip.Content="主面板显示时按下Ctrl+F开始搜索"
+                             hc:Poptip.Placement="Top"
+                             Style="{StaticResource MyRadioBtnStyle}" Content="快捷键"
+                             IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=0}"/>
+                <RadioButton Margin="10,0,0,0" 
+                             hc:Poptip.Content="主面板显示时按下按键直接搜索"
+                             hc:Poptip.Placement="Top"
+                             Style="{StaticResource MyRadioBtnStyle}" Content="按键即搜" 
+                             IsChecked="{Binding SearchType, Mode=TwoWay, Converter={StaticResource SearchTypeConvert}, ConverterParameter=1}"/>
             </hc:UniformSpacingPanel>
 
             <hc:UniformSpacingPanel Spacing="10"  Margin="0,10,0,0" Grid.ColumnSpan="4">
diff --git a/Control/UserControls/Config/OtherControl.xaml b/Control/UserControls/Config/OtherControl.xaml
index c0e530a..91b630c 100644
--- a/Control/UserControls/Config/OtherControl.xaml
+++ b/Control/UserControls/Config/OtherControl.xaml
@@ -54,37 +54,37 @@
                 <TextBlock Text="排序方式"  Margin="0,25,0,0"/>
 
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
-                    <RadioButton x:Name="CustomSort" Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                                 Style="{StaticResource RadioButtonIcon}" Content="自定义"
+                    <RadioButton x:Name="CustomSort" Margin="10,0,0,0"  
+                                 Style="{StaticResource MyRadioBtnStyle}" Content="自定义"
                                  Tag="1"
                                  hc:IconElement.Geometry="{StaticResource CustomSort}"
                                  PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
                                  IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=1}"/>
 
-                    <RadioButton x:Name="CountUpSort" Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                    <RadioButton x:Name="CountUpSort" Margin="10,0,0,0" 
                                  hc:IconElement.Geometry="{StaticResource UpSort}"
-                                 Style="{StaticResource RadioButtonIcon}" Content="使用次数" 
+                                 Style="{StaticResource MyRadioBtnStyle}" Content="使用次数" 
                                  Tag="2"
                                  PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
                                  IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=2}"/>
 
-                    <RadioButton x:Name="CountLowSort" Margin="10,0,0,0" Visibility="Collapsed" Background="{DynamicResource SecondaryRegionBrush}"
+                    <RadioButton x:Name="CountLowSort" Margin="10,0,0,0" Visibility="Collapsed" 
                                  hc:IconElement.Geometry="{StaticResource LowSort}"
-                                 Style="{StaticResource RadioButtonIcon}" Content="使用次数" 
+                                 Style="{StaticResource MyRadioBtnStyle}" Content="使用次数" 
                                  Tag="3"
                                  PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
                                  IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=3}"/>
 
-                    <RadioButton x:Name="NameUpSort" Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                    <RadioButton x:Name="NameUpSort" Margin="10,0,0,0"
                                  hc:IconElement.Geometry="{StaticResource UpSort}"
-                                 Style="{StaticResource RadioButtonIcon}" Content="名称" 
+                                 Style="{StaticResource MyRadioBtnStyle}" Content="名称" 
                                  Tag="4"
                                  PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
                                  IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=4}"/>
 
-                    <RadioButton x:Name="NameLowSort" Margin="10,0,0,0" Visibility="Collapsed" Background="{DynamicResource SecondaryRegionBrush}"
+                    <RadioButton x:Name="NameLowSort" Margin="10,0,0,0" Visibility="Collapsed" 
                                  hc:IconElement.Geometry="{StaticResource LowSort}"
-                                 Style="{StaticResource RadioButtonIcon}" Content="名称" 
+                                 Style="{StaticResource MyRadioBtnStyle}" Content="名称" 
                                  Tag="5"
                                  PreviewMouseLeftButtonDown="SortType_PreviewMouseLeftButtonDown"
                                  IsChecked="{Binding IconSortType, Mode=OneWay, Converter={StaticResource SortTypeConvert}, ConverterParameter=5}"/>
@@ -92,14 +92,14 @@
                 </hc:UniformSpacingPanel>
                 <TextBlock Text="更新源"  Margin="0,25,0,0"/>
                 <hc:UniformSpacingPanel Spacing="10" Margin="20,8,0,0">
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                             Style="{StaticResource RadioButtonIcon}" Content="Gitee"
+                    <RadioButton Margin="10,0,0,0" 
+                             Style="{StaticResource MyRadioBtnStyle}" Content="Gitee"
                              hc:IconElement.Geometry="{StaticResource Gitee}"
                              Foreground="#B32225"
                              IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=1}"/>
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
+                    <RadioButton Margin="10,0,0,0"
                              hc:IconElement.Geometry="{StaticResource GitHub}"
-                             Style="{StaticResource RadioButtonIcon}" Content="GitHub" 
+                             Style="{StaticResource MyRadioBtnStyle}" Content="GitHub" 
                              Foreground="Black"
                              IsChecked="{Binding UpdateType, Mode=TwoWay, Converter={StaticResource UpdateTypeConvert}, ConverterParameter=2}"/>
                 </hc:UniformSpacingPanel>
diff --git a/Control/UserControls/Config/ThemeControl.xaml b/Control/UserControls/Config/ThemeControl.xaml
index 256524c..2ac84e5 100644
--- a/Control/UserControls/Config/ThemeControl.xaml
+++ b/Control/UserControls/Config/ThemeControl.xaml
@@ -24,11 +24,11 @@
                     <TextBlock Text="背景风格" VerticalAlignment="Center"/>
                 </hc:UniformSpacingPanel>
                 <hc:UniformSpacingPanel Spacing="10" Margin="10,5,0,0" Grid.ColumnSpan="4">
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Click="BGStyle_Changed" Content="图 片"
+                    <RadioButton Margin="10,0,0,0" 
+                         Style="{StaticResource MyRadioBtnStyle}" Click="BGStyle_Changed" Content="图 片"
                          IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=1}"/>
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}"
-                         Style="{StaticResource RadioButtonIcon}" Click="BGStyle_Changed" Content="纯 色" 
+                    <RadioButton Margin="10,0,0,0" 
+                         Style="{StaticResource MyRadioBtnStyle}" Click="BGStyle_Changed" Content="纯 色" 
                          IsChecked="{Binding BGStyle, Mode=TwoWay, Converter={StaticResource BGStyleConvert}, ConverterParameter=2}"/>
                 </hc:UniformSpacingPanel>
 
diff --git a/Control/Windows/ToDoInfoWindow.xaml b/Control/Windows/ToDoInfoWindow.xaml
index e288b38..0d3b865 100644
--- a/Control/Windows/ToDoInfoWindow.xaml
+++ b/Control/Windows/ToDoInfoWindow.xaml
@@ -60,11 +60,11 @@
 
                     <hc:UniformSpacingPanel Spacing="10" Grid.ColumnSpan="4" Margin="0,10,0,0">
                         <TextBlock Text="运行方式:"  Style="{StaticResource LeftTB}"/>
-                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Tag="1" Background="{DynamicResource SecondaryRegionBrush}" 
-                         Style="{StaticResource RadioButtonIcon}" Content="指定时间"
+                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Tag="1" 
+                         Style="{StaticResource MyRadioBtnStyle}" Content="指定时间"
                          IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=1}"/>
-                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked" Background="{DynamicResource SecondaryRegionBrush}"  Tag="2"
-                         Style="{StaticResource RadioButtonIcon}" Content="CRON表达式"
+                        <RadioButton Margin="10,0,0,0" Checked="ExecType_Checked"  Tag="2"
+                         Style="{StaticResource MyRadioBtnStyle}" Content="CRON表达式"
                          IsChecked="{Binding ExecType, Mode=OneWay, Converter={StaticResource TodoTaskExecConvert}, ConverterParameter=2}"/>
                     </hc:UniformSpacingPanel>
 
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 1407230..76ee9ab 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -34,7 +34,6 @@
 
     <Window.Resources>
         <RoutedUICommand x:Key="SearchHotKeyDown" Text="SearchHotKeyDown"/>
-
         <cvt:MenuWidthConvert x:Key="MenuWidthConvert"/>
         <cvt:OpcityConvert x:Key="OpcityConvert"/>
         <cvt:IntToCornerRadius x:Key="IntToCornerRadius"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index d0849fc..ce41250 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -813,6 +813,10 @@ namespace GeekDesk
                 appData.AppConfig.WindowWidth = this.Width;
                 appData.AppConfig.WindowHeight = this.Height;
             }
+            if (guideRun)
+            {
+                Guide();
+            }
         }
 
 
@@ -1032,27 +1036,30 @@ namespace GeekDesk
             return hwnd;
         }
 
-
-
         #region 新手引导
+
+        private int guideIndex = 0;
+        private bool guideRun = false;
         private void Guide()
         {
             try
             {
+                guideRun = true;
                 //防止影响主程序进程
                 if (CheckShouldShowApp())
                 {
                     ShowApp();
                 }
                 GrayBorder.Visibility = Visibility.Visible;
-                GuideSwitch(0);
+                GuideSwitch(guideIndex);
                 GuideCard.Visibility = Visibility.Visible;
             }
-            catch (Exception) { }
+            catch (Exception) { guideRun = false; }
         }
 
         private void GuideSwitch(int index)
         {
+            guideIndex = index;
             GuideNum.Text = Convert.ToString(index + 1);
             GuideTitle1.Text = GuideInfoList.mainWindowGuideList[index].Title1;
             GuideTitle2.Text = GuideInfoList.mainWindowGuideList[index].Title2;
@@ -1131,6 +1138,8 @@ namespace GeekDesk
             if ("完成".Equals(NextGuideBtn.Content.ToString())) {
                 GrayBorder.Visibility = Visibility.Collapsed;
                 GuideCard.Visibility = Visibility.Collapsed;
+                guideIndex = 0;
+                guideRun = false;
                 return;
             }
             int index = Convert.ToInt32(GuideNum.Text.ToString()) - 1;
diff --git a/Resource/Dictionary/CommonStyle.xaml b/Resource/Dictionary/CommonStyle.xaml
index 5c38195..1ad6d47 100644
--- a/Resource/Dictionary/CommonStyle.xaml
+++ b/Resource/Dictionary/CommonStyle.xaml
@@ -72,6 +72,15 @@
                     </Setter.Value>
                 </Setter>
             </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background">
+                    <Setter.Value>
+                        <LinearGradientBrush EndPoint="1,0" StartPoint="0,0" Opacity="0.7">
+                            <GradientStop Color="#FF9EA3A6"/>
+                        </LinearGradientBrush>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
         </Style.Triggers>
     </Style>
 
@@ -91,4 +100,24 @@
     </Style>
 
 
+    
+    <!--radio btn style-->
+    <Style x:Key="MyRadioBtnStyle" TargetType="RadioButton" BasedOn="{StaticResource RadioButtonIcon}">
+        <Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Color="White" Opacity="0.7"/>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background">
+                    <Setter.Value>
+                        <SolidColorBrush Color="#EEEEEE" Opacity="0.7"/>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
 </ResourceDictionary>
\ No newline at end of file