From d35871ec2ca6a1b9f3116136e1f6c39c3a45993d Mon Sep 17 00:00:00 2001
From: STBBRD <62409850+STBBRD@users.noreply.github.com>
Date: Sat, 20 Apr 2024 20:42:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BD=AE=E5=BA=95=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化课程表编辑器：新增深色主题，为复制粘贴按钮增加动画，优化粘贴体验

优化启动台编辑器：新增深色主题
---
 .../Classes/Settings.cs                       |   1 +
 .../Controls/TimetableEditorItem.xaml         |   4 +-
 .../LauncherEditor.xaml                       |  12 +--
 .../LauncherEditor.xaml.cs                    |   2 +-
 ZongziTEK_Blackboard_Sticker/MainWindow.xaml  |  23 ++--
 .../MainWindow.xaml.cs                        | 102 +++++++++++-------
 ZongziTEK_Blackboard_Sticker/Style/Dark.xaml  |   2 +
 ZongziTEK_Blackboard_Sticker/Style/Light.xaml |   2 +
 .../TimetableEditor.xaml                      |  15 +--
 .../TimetableEditor.xaml.cs                   |  42 ++++++--
 10 files changed, 132 insertions(+), 73 deletions(-)

diff --git a/ZongziTEK_Blackboard_Sticker/Classes/Settings.cs b/ZongziTEK_Blackboard_Sticker/Classes/Settings.cs
index 77a9166..1acdf42 100644
--- a/ZongziTEK_Blackboard_Sticker/Classes/Settings.cs
+++ b/ZongziTEK_Blackboard_Sticker/Classes/Settings.cs
@@ -67,6 +67,7 @@ public class InfoBoard
     public class Automation
     {
         public bool IsAutoHideHugoAssistantEnabled { get; set; } = false;
+        public bool IsBottomMost { get; set; } = true;
     }
 
     public class Update
diff --git a/ZongziTEK_Blackboard_Sticker/Controls/TimetableEditorItem.xaml b/ZongziTEK_Blackboard_Sticker/Controls/TimetableEditorItem.xaml
index 5e256de..335b38f 100644
--- a/ZongziTEK_Blackboard_Sticker/Controls/TimetableEditorItem.xaml
+++ b/ZongziTEK_Blackboard_Sticker/Controls/TimetableEditorItem.xaml
@@ -13,8 +13,8 @@
         </Style>
     </UserControl.Resources>
     <Border HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="48"
-            Background="#FFFBFBFB" 
-            CornerRadius="2" BorderBrush="#FFE1E6EA" BorderThickness="1">
+            Background="{DynamicResource CardBorderBackgroundColor}" 
+            CornerRadius="2" BorderBrush="{DynamicResource CardBorderBrush}" BorderThickness="1">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>
diff --git a/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml b/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml
index dad1c8a..98687bc 100644
--- a/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml
+++ b/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml
@@ -7,26 +7,26 @@
         xmlns:local="clr-namespace:ZongziTEK_Blackboard_Sticker"
         mc:Ignorable="d"
         Title="ZongziTEK 黑板贴 - 启动台编辑器" Height="450" Width="800" MinHeight="450" MinWidth="800"
-        ui:WindowHelper.SystemBackdropType="Mica" ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.FixMaximizedWindow="False" ui:ThemeManager.RequestedTheme="Light"
+        ui:WindowHelper.SystemBackdropType="Mica" ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.FixMaximizedWindow="False"
         WindowStartupLocation="CenterScreen">
     <Grid>
         <TextBlock Text="编辑启动台" Margin="24,12,24,12" FontSize="32"/>
         <ui:ProgressRing Name="ListProgressBar" IsIndeterminate="True" Margin="48" Visibility="Collapsed"/>
-        <ScrollViewer Name="ListScrollViewer" Margin="24,64,24,64" PanningMode="VerticalOnly">
+        <ui:ScrollViewerEx Name="ListScrollViewer" Margin="24,64,24,64" PanningMode="VerticalOnly">
             <ui:SimpleStackPanel x:Name="ListStackPanel" Spacing="8"/>
-        </ScrollViewer>
+        </ui:ScrollViewerEx>
         <ui:SimpleStackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="24,12,24,12" Height="32" Spacing="8" Orientation="Horizontal" >
             <Button Content="刷新" Width="80" Click="ButtonRefresh_Click" VerticalAlignment="Stretch"/>
             <Button Content="新建" Width="80" Click="ButtonNew_Click" VerticalAlignment="Stretch"/>
         </ui:SimpleStackPanel>
 
-        <Border Name="BorderNew" Background="#ffF1F3F9" Visibility="Collapsed">
+        <Border Name="BorderNew" Background="{DynamicResource CardBorderBackgroundColor}" Visibility="Collapsed">
             <Grid>
                 <ui:SimpleStackPanel Margin="24,12,24,12" Spacing="8">
                     <TextBlock Text="新建项" FontSize="32"/>
                     <ui:InfoBar Title="实验性功能" Message="已知问题：某些文件无法添加，或添加后不在启动台中显示" IsOpen="True" IsClosable="False"/>
                 </ui:SimpleStackPanel>
-                <ScrollViewer Margin="24,128,24,64" PanningMode="VerticalOnly">
+                <ui:ScrollViewerEx Margin="24,128,24,64" PanningMode="VerticalOnly">
                     <ui:SimpleStackPanel Spacing="8">
                         <TextBlock Text="文件路径" FontSize="16"/>
                         <Grid Name="GridDataLocation">
@@ -41,7 +41,7 @@
                         <TextBlock Text="名称" FontSize="16"/>
                         <TextBox Name="TextBoxLinkName"/>
                     </ui:SimpleStackPanel>
-                </ScrollViewer>
+                </ui:ScrollViewerEx>
                 <ui:SimpleStackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="24,12,24,12" Spacing="8" Orientation="Horizontal" >
                     <Button Name="ButtonCancelNew" Content="取消" Width="80" Click="ButtonCancelNew_Click"/>
                     <Button Name="ButtonSaveNew" Content="保存" Style="{StaticResource AccentButtonStyle}" Width="80" Click="ButtonSaveNew_Click"/>
diff --git a/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml.cs b/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml.cs
index b5eb1ac..2dd86c6 100644
--- a/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml.cs
+++ b/ZongziTEK_Blackboard_Sticker/LauncherEditor.xaml.cs
@@ -85,7 +85,7 @@ private async void LoadList()
                         HorizontalAlignment = HorizontalAlignment.Stretch,
                         HorizontalContentAlignment = HorizontalAlignment.Stretch,
                         Height = 48,
-                        Background = new SolidColorBrush(Color.FromArgb(255, 251, 251, 251))
+                        //Background = new SolidColorBrush(Color.FromArgb(255, 251, 251, 251))
                     };
 
                     //按钮里面的布局
diff --git a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml
index 5dffc83..69b4e55 100644
--- a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml
+++ b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml
@@ -149,7 +149,7 @@
                             <RowDefinition Height="auto"/>
                         </Grid.RowDefinitions>
                         <ui:ProgressRing Name="ProgressBarLauncher" Grid.Row="0" VerticalAlignment="Bottom" IsIndeterminate="True" Margin="20" Visibility="Collapsed"/>
-                        <ScrollViewer Name="ScrollViewerLauncher" PanningMode="VerticalOnly" Grid.Row="0" Margin="8" VerticalAlignment="Bottom" MaxHeight="216">
+                        <ui:ScrollViewerEx Name="ScrollViewerLauncher" PanningMode="VerticalOnly" Grid.Row="0" Margin="8" VerticalAlignment="Bottom" MaxHeight="216">
                             <ui:SimpleStackPanel x:Name="StackPanelLauncher" Spacing="8" VerticalAlignment="Bottom">
                                 <Button Name="buttonExplorer" HorizontalAlignment="Stretch" Height="36" Click="buttonExplorer_Click" HorizontalContentAlignment="Left" Background="#00000000" BorderThickness="0">
                                     <ui:SimpleStackPanel Spacing="8" Margin="0" Orientation="Horizontal">
@@ -158,7 +158,7 @@
                                     </ui:SimpleStackPanel>
                                 </Button>
                             </ui:SimpleStackPanel>
-                        </ScrollViewer>
+                        </ui:ScrollViewerEx>
 
                         <Border Grid.Row="1" Height="40" Margin="8" CornerRadius="4" VerticalAlignment="Bottom" Background="{Binding Background, ElementName=btnHideSettingsPanel}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
                             <Grid>
@@ -184,15 +184,15 @@
                             <RowDefinition/>
                             <RowDefinition Height="auto"/>
                         </Grid.RowDefinitions>
-                        <ScrollViewer Name="ScrollViewerShowCurriculum" PanningMode="VerticalOnly">
+                        <ui:ScrollViewerEx Name="ScrollViewerShowCurriculum" PanningMode="VerticalOnly">
                             <Grid Margin="16">
                                 <TextBlock Visibility="Collapsed" Name="textBlockCurriculum" TextWrapping="Wrap"
                                     Text="语文&#10;数学&#10;英语&#10;物理&#10;化学&#10;生物&#10;历史&#10;政治&#10;地理&#10;活动&#10;体育" 
                                     FontSize="28" Foreground="{DynamicResource ForegroundColor}" TextAlignment="Center"/>
                                 <ui:SimpleStackPanel Name="StackPanelShowTimetable"/>
                             </Grid>
-                        </ScrollViewer>
-                        <ScrollViewer x:Name="scrollViewerCurriculum" Visibility="Collapsed" PanningMode="VerticalOnly">
+                        </ui:ScrollViewerEx>
+                        <ui:ScrollViewerEx x:Name="ScrollViewerCurriculum" Visibility="Collapsed" PanningMode="VerticalOnly">
                             <ui:SimpleStackPanel Spacing="8" Margin="24">
                                 <TextBlock Text="编辑课程表" FontSize="36" Foreground="{DynamicResource ForegroundColor}"/>
                                 <TextBlock Text="在文本框内输入课程，可回车换行，建议一行一节课" TextWrapping="Wrap" FontSize="16" Foreground="{DynamicResource ForegroundColor}"/>
@@ -220,7 +220,7 @@
                                 <TextBlock Text="临时" FontSize="24" Foreground="{DynamicResource ForegroundColor}"/>
                                 <TextBox x:Name="textBoxTempCurriculums" AcceptsReturn="True" TextWrapping="Wrap" FontSize="16" Foreground="{DynamicResource ForegroundColor}"/>
                             </ui:SimpleStackPanel>
-                        </ScrollViewer>
+                        </ui:ScrollViewerEx>
                         <Border Grid.Row="1" Height="40" Margin="8" CornerRadius="4" VerticalAlignment="Bottom" Background="{Binding Background, ElementName=btnHideSettingsPanel}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
                             <Grid>
                                 <Label Content="课程表" VerticalAlignment="Center" Margin="8,0" FontSize="20"/>
@@ -267,13 +267,13 @@
                 <!--其它-->
                 <Border x:Name="borderFirstOpening" CornerRadius="8" Grid.RowSpan="4" Grid.ColumnSpan="2" Background="{DynamicResource OtherPanelsBackgroundColor}" Visibility="Collapsed">
                     <Grid Margin="48">
-                        <ScrollViewer PanningMode="VerticalOnly">
+                        <ui:ScrollViewerEx PanningMode="VerticalOnly">
                             <ui:SimpleStackPanel Spacing="16">
                                 <TextBlock FontSize="32" Text="初次使用,请查看以下常用设置项" Foreground="{DynamicResource ForegroundColor}"/>
                                 <ui:ToggleSwitch Header="开机时运行" OnContent="开" OffContent="关" IsOn="{Binding IsOn, ElementName=ToggleSwitchRunAtStartup}"/>
                                 <TextBox ui:ControlHelper.Header="天气城市" Text="{Binding Text, ElementName=TextBoxWeatherCity}"/>
                             </ui:SimpleStackPanel>
-                        </ScrollViewer>
+                        </ui:ScrollViewerEx>
                         <Grid VerticalAlignment="Bottom">
                             <Button x:Name="btnCloseFirstOpening" HorizontalAlignment="Right" Content="完成" Width="120" Click="btnCloseFirstOpening_Click" Foreground="{DynamicResource ForegroundColor}"/>
                         </Grid>
@@ -294,13 +294,14 @@
         <Border Name="borderSettingsPanel" Grid.ColumnSpan="2" Background="{DynamicResource OtherPanelsBackgroundColor}" Visibility="Collapsed">
             <Grid Margin="48">
                 <TextBlock Text="设置" Foreground="{DynamicResource ForegroundColor}" FontSize="32"/>
-                <ScrollViewer PanningMode="VerticalOnly" Margin="12,64,12,64">
+                <ui:ScrollViewerEx PanningMode="VerticalOnly" Margin="12,64,12,64">
                     <ui:SimpleStackPanel Spacing="16">
                         <GroupBox Header="行为" Foreground="{DynamicResource ForegroundColor}">
                             <ui:SimpleStackPanel Spacing="12">
                                 <Button x:Name="btnRestart" Content="重新启动黑板贴" Width="240" Click="btnRestart_Click" 
                                             Foreground="{DynamicResource ForegroundColor}"/>
-                                <ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" Header="开机时运行" OnContent="开" OffContent="关" Toggled="ToggleSwitchRunAtStartup_Toggled" Foreground="{DynamicResource ForegroundColor}"/>
+                                <ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" Header="开机时运行" OnContent="启用" OffContent="禁用" Toggled="ToggleSwitchRunAtStartup_Toggled" Foreground="{DynamicResource ForegroundColor}"/>
+                                <ui:ToggleSwitch Name="ToggleSwitchBottomMost" Header="将黑板贴置于底层" OnContent="启用" OffContent="禁用" Toggled="ToggleSwitchBottomMost_Toggled"  Foreground="{DynamicResource ForegroundColor}"/>
                             </ui:SimpleStackPanel>
                         </GroupBox>
                         <GroupBox Header="外观" Foreground="{DynamicResource ForegroundColor}">
@@ -426,7 +427,7 @@
                             </ui:SimpleStackPanel>
                         </GroupBox>
                     </ui:SimpleStackPanel>
-                </ScrollViewer>
+                </ui:ScrollViewerEx>
                 <Grid VerticalAlignment="Bottom">
                     <Button x:Name="btnHideSettingsPanel" Click="btnHideSettingsPanel_Click" HorizontalAlignment="Right" Content="关闭" Width="120" Foreground="{DynamicResource ForegroundColor}"/>
                 </Grid>
diff --git a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
index 9de2fe2..0e632d4 100644
--- a/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
+++ b/ZongziTEK_Blackboard_Sticker/MainWindow.xaml.cs
@@ -109,7 +109,8 @@ public MainWindow()
         private void window_StateChanged(object sender, EventArgs e)
         {
             WindowState = WindowState.Normal;
-            WindowsHelper.SetBottom(window);
+
+            if (Settings.Automation.IsBottomMost) WindowsHelper.SetBottom(window);
         }
 
         private void window_Loaded(object sender, RoutedEventArgs e)
@@ -119,7 +120,7 @@ private void window_Loaded(object sender, RoutedEventArgs e)
 
         private void window_Activated(object sender, EventArgs e)
         {
-            WindowsHelper.SetBottom(window);
+            if (Settings.Automation.IsBottomMost) WindowsHelper.SetBottom(window);
         }
 
         public static bool CloseIsFromButton = false;
@@ -1033,7 +1034,7 @@ private void editCurriculumButton_Click(object sender, RoutedEventArgs e)
                 editCurriculumButton.Visibility = Visibility.Collapsed;
 
                 saveCurriculumButton.Visibility = Visibility.Visible;
-                scrollViewerCurriculum.Visibility = Visibility.Visible;
+                ScrollViewerCurriculum.Visibility = Visibility.Visible;
             }
         }
 
@@ -1045,7 +1046,7 @@ private void saveCurriculumButton_Click(object sender, RoutedEventArgs e)
             editCurriculumButton.Visibility = Visibility.Visible;
 
             saveCurriculumButton.Visibility = Visibility.Collapsed;
-            scrollViewerCurriculum.Visibility = Visibility.Collapsed;
+            ScrollViewerCurriculum.Visibility = Visibility.Collapsed;
 
             LoadTimetableorCurriculum();
         }
@@ -1123,7 +1124,7 @@ private void LoadTimetable()
                         Foreground = (SolidColorBrush)FindResource("ForegroundColor"),
                         Text = lesson.Subject
                     };
-                    if(lesson.IsSplitBelow)
+                    if (lesson.IsSplitBelow)
                     {
                         textBlock.Margin = new Thickness(0, 0, 0, 8);
                     }
@@ -1402,8 +1403,39 @@ private void buttonExplorer_Click(object sender, RoutedEventArgs e)
             {
                 Process.Start(@"C:\Windows\System32\explorer.exe", "/s,");
             }
-            catch (Exception)
-            { }
+            catch (Exception) { }
+        }
+        private void ButtonReloadLauncher_Click(object sender, RoutedEventArgs e)
+        {
+            ScrollViewerLauncher.Visibility = Visibility.Collapsed;
+            ProgressBarLauncher.Visibility = Visibility.Visible;
+
+            Button buttonExplorerBackup = buttonExplorer;
+
+            StackPanelLauncher.Children.Clear();
+
+            Task.Run(() =>
+            {
+                Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    StackPanelLauncher.Children.Add(buttonExplorerBackup);
+                }));
+            });
+
+            Task.Run(() =>
+            {
+                Dispatcher.BeginInvoke(() =>
+                {
+                    LoadLauncher();
+                });
+            });
+            btnHideSettingsPanel_Click(null, null);
+        }
+
+        private void ButtonEditLauncher_Click(object sender, RoutedEventArgs e)
+        {
+            new LauncherEditor().ShowDialog();
+            ButtonReloadLauncher_Click(null, null);
         }
 
         #endregion
@@ -1440,38 +1472,6 @@ private void btnRestart_Click(object sender, RoutedEventArgs e)
             CloseIsFromButton = true;
             System.Windows.Application.Current.Shutdown();
         }
-        private void ButtonReloadLauncher_Click(object sender, RoutedEventArgs e)
-        {
-            ScrollViewerLauncher.Visibility = Visibility.Collapsed;
-            ProgressBarLauncher.Visibility = Visibility.Visible;
-
-            Button buttonExplorerBackup = buttonExplorer;
-
-            StackPanelLauncher.Children.Clear();
-
-            Task.Run(() =>
-            {
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    StackPanelLauncher.Children.Add(buttonExplorerBackup);
-                }));
-            });
-
-            Task.Run(() =>
-            {
-                Dispatcher.BeginInvoke(() =>
-                {
-                    LoadLauncher();
-                });
-            });
-            btnHideSettingsPanel_Click(null, null);
-        }
-
-        private void ButtonEditLauncher_Click(object sender, RoutedEventArgs e)
-        {
-            new LauncherEditor().ShowDialog();
-            ButtonReloadLauncher_Click(null, null);
-        }
 
         private void ToggleSwitchRunAtStartup_Toggled(object sender, RoutedEventArgs e)
         {
@@ -1486,6 +1486,26 @@ private void ToggleSwitchRunAtStartup_Toggled(object sender, RoutedEventArgs e)
             }
         }
 
+        private void ToggleSwitchBottomMost_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isSettingsLoaded) return;
+
+            Settings.Automation.IsBottomMost = ToggleSwitchBottomMost.IsOn;
+            SaveSettings();
+
+            if (!ToggleSwitchBottomMost.IsOn)
+            {
+                if (MessageBox.Show("需要重新启动黑板贴来使此设置生效\n确定要重新启动黑板贴吗", "ZongziTEK 黑板贴", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
+                {
+                    btnRestart_Click(null, null);
+                }
+                else
+                {
+                    ToggleSwitchBottomMost.IsOn = true;
+                }
+            }
+        }
+
         private void SliderWindowScale_MouseUp(object sender, MouseButtonEventArgs e)
         {
             SetWindowScaleTransform(SliderWindowScale.Value);
@@ -1828,6 +1848,8 @@ private void LoadSettings()
                 SetTheme("Dark");
             }
 
+            ToggleSwitchBottomMost.IsOn = Settings.Automation.IsBottomMost;
+
             SliderWindowScale.Value = Settings.Look.WindowScaleMultiplier;
             SetWindowScaleTransform(SliderWindowScale.Value);
 
@@ -2206,7 +2228,7 @@ public static string GetBNSPath()
 
         private void SwitchLookMode()
         {
-            switch(Settings.Look.LookMode)
+            switch (Settings.Look.LookMode)
             {
                 case 0: // 默认
                     BorderMain.ClearValue(WidthProperty);
diff --git a/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml b/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml
index 9650c54..cf35ac9 100644
--- a/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml
+++ b/ZongziTEK_Blackboard_Sticker/Style/Dark.xaml
@@ -5,4 +5,6 @@
     <SolidColorBrush x:Key="OtherPanelsBackgroundColor" Color="#FF222222"/>
     <SolidColorBrush x:Key="ForegroundColor" Color="White"/>
     <SolidColorBrush x:Key="BorderBrush" Color="#12FFFFFF"/>
+    <SolidColorBrush x:Key="CardBorderBackgroundColor" Color="#262b3c"/>
+    <SolidColorBrush x:Key="CardBorderBrush" Color="#2b2b2b"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ZongziTEK_Blackboard_Sticker/Style/Light.xaml b/ZongziTEK_Blackboard_Sticker/Style/Light.xaml
index 8e5feeb..f2476be 100644
--- a/ZongziTEK_Blackboard_Sticker/Style/Light.xaml
+++ b/ZongziTEK_Blackboard_Sticker/Style/Light.xaml
@@ -5,4 +5,6 @@
     <SolidColorBrush x:Key="OtherPanelsBackgroundColor" Color="#FFDDDDDD"/>
     <SolidColorBrush x:Key="ForegroundColor" Color="Black"/>
     <SolidColorBrush x:Key="BorderBrush" Color="#0F000000"/>
+    <SolidColorBrush x:Key="CardBorderBackgroundColor" Color="#FBFBFB"/>
+    <SolidColorBrush x:Key="CardBorderBrush" Color="#E1E6EA"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml
index 112acd3..cfd556f 100644
--- a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml
+++ b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml
@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:ZongziTEK_Blackboard_Sticker"
         mc:Ignorable="d"
         Title="ZongziTEK 黑板贴 - 课程表编辑器" Height="600" Width="800" MinHeight="450" MinWidth="800"
-        ui:WindowHelper.SystemBackdropType="Mica" ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.FixMaximizedWindow="False" ui:ThemeManager.RequestedTheme="Light"
+        ui:WindowHelper.SystemBackdropType="Mica" ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.FixMaximizedWindow="False"
         Closing="Window_Closing" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid VerticalAlignment="Top" Margin="24,12,24,12">
@@ -26,7 +26,7 @@
                 <TextBlock Text="课表" FontSize="16"/>
                 <TextBlock Name="TextBlockHintTempTimetable" Text="，如需展示临时课表，请在课程表菜单中选择" FontSize="16" Visibility="Collapsed"/>
             </StackPanel>
-            <Border Height="48" Background="#FFFBFBFB" CornerRadius="2" BorderBrush="#FFE1E6EA" BorderThickness="1" Grid.Row="1">
+            <Border Height="48" Background="{DynamicResource CardBorderBackgroundColor}" CornerRadius="2" BorderBrush="{DynamicResource CardBorderBrush}" BorderThickness="1" Grid.Row="1">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition/>
@@ -39,10 +39,10 @@
                     <TextBlock Grid.Column="2" Text="结束时间" FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 </Grid>
             </Border>
-            <ScrollViewer Name="ScrollViewerTimetable" PanningMode="VerticalOnly" Grid.Row="2" PreviewMouseWheel="ScrollViewerTimetable_PreviewMouseWheel">
+            <ui:ScrollViewerEx Name="ScrollViewerTimetable" PanningMode="VerticalOnly" Grid.Row="2" PreviewMouseWheel="ScrollViewerTimetable_PreviewMouseWheel">
                 <ui:SimpleStackPanel x:Name="ListStackPanel" Spacing="4">
                 </ui:SimpleStackPanel>
-            </ScrollViewer>
+            </ui:ScrollViewerEx>
         </Grid>
         <Grid VerticalAlignment="Bottom" Margin="24,12,24,12" Height="32">
             <ui:SimpleStackPanel Spacing="8" Orientation="Horizontal">
@@ -56,8 +56,11 @@
                     <ComboBoxItem Content="周日"/>
                     <ComboBoxItem Content="临时"/>
                 </ComboBox>
-                <Button Name="ButtonCopy" Width="32" Height="32" Padding="0" Click="ButtonCopy_Click">
-                    <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Copy}" FontFamily="{StaticResource SegoeFluentIcons}"/>
+                <Button Name="ButtonCopy" Width="84" Height="32" Padding="0" Click="ButtonCopy_Click">
+                    <ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Left">
+                        <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Copy}" FontFamily="{StaticResource SegoeFluentIcons}" HorizontalAlignment="Left"/>
+                        <Label Name="LabelCopy" Content="复制"/>
+                    </ui:SimpleStackPanel>
                 </Button>
                 <Button Name="ButtonPaste" Visibility="Collapsed" Width="32" Height="32" Padding="0" Click="ButtonPaste_Click">
                     <ui:FontIcon Glyph="{x:Static ui:SegoeIcons.Paste}" FontFamily="{StaticResource SegoeFluentIcons}"/>
diff --git a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs
index 51e1584..0e03e82 100644
--- a/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs
+++ b/ZongziTEK_Blackboard_Sticker/TimetableEditor.xaml.cs
@@ -11,6 +11,7 @@
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
+using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
@@ -40,7 +41,7 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
             if (!isCloseWithoutWarning)
             {
                 e.Cancel = true;
-                if (MessageBox.Show("确定直接关闭课程表编辑器吗\n这将丢失未保存的课程", "ZongziTEK 黑板贴", MessageBoxButton.OKCancel, MessageBoxImage.Warning) == MessageBoxResult.OK)
+                if (MessageBox.Show("确定要直接关闭课程表编辑器吗\n这将丢失未保存的课程", "ZongziTEK 黑板贴", MessageBoxButton.OKCancel, MessageBoxImage.Warning) == MessageBoxResult.OK)
                 {
                     e.Cancel = false;
                 }
@@ -174,20 +175,47 @@ private void LoadTimetable()
         private void ButtonCopy_Click(object sender, RoutedEventArgs e)
         {
             ClipBoard = GetSelectedDay().ToList();
-            ButtonPaste.Visibility = Visibility.Visible;
+
+            if (ButtonCopy.ActualWidth > 32)
+            {
+                LabelCopy.Visibility = Visibility.Collapsed;
+                DoubleAnimation buttonCopyAnimation = new DoubleAnimation()
+                {
+                    From = ButtonCopy.ActualWidth,
+                    To = 32,
+                    Duration = TimeSpan.FromMilliseconds(500),
+                    EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseOut }
+                };
+                ButtonCopy.BeginAnimation(WidthProperty, buttonCopyAnimation);
+
+                DoubleAnimation buttonPasteAnimation = new DoubleAnimation()
+                {
+                    From = 0,
+                    To = 1,
+                    Duration = TimeSpan.FromMilliseconds(500),
+                    EasingFunction = new CubicEase() { EasingMode = EasingMode.EaseOut }
+                };
+                ButtonPaste.Visibility = Visibility.Visible;
+                ButtonPaste.BeginAnimation(OpacityProperty, buttonPasteAnimation);
+            }
         }
 
         private void ButtonPaste_Click(object sender, RoutedEventArgs e)
         {
-            if (MessageBox.Show("这里原有的课程将被覆盖", "确定要粘贴吗？", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
+            if (GetSelectedDay().Count > 0)
             {
-                GetSelectedDay().Clear();
-                foreach (Lesson lesson in ClipBoard)
+                if (MessageBox.Show("这里原有的课程将被覆盖", "确定要粘贴吗？", MessageBoxButton.OKCancel) == MessageBoxResult.Cancel)
                 {
-                    GetSelectedDay().Add(lesson);
+                    return;
                 }
-                LoadTimetable();
             }
+
+            GetSelectedDay().Clear();
+            foreach (Lesson lesson in ClipBoard)
+            {
+                GetSelectedDay().Add(lesson);
+            }
+            LoadTimetable();
         }
 
         #endregion