From 33c5429a2de9d4d62e5217e7a5695ca92c142bf3 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Tue, 4 Apr 2023 19:32:29 +1000
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20Ctrl+Enter=20=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Windows/WinDesign/TalkBox.xaml | 26 ++++++++++---------
 .../WinDesign/TalkBox.xaml.cs                 |  9 +++++++
 .../WinDesign/TalkBoxAPI.xaml                 | 19 +++++++-------
 .../WinDesign/TalkBoxAPI.xaml.cs              | 16 +++++++++++-
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/VPet-Simulator.Windows/WinDesign/TalkBox.xaml b/VPet-Simulator.Windows/WinDesign/TalkBox.xaml
index 2208444..143f1f7 100644
--- a/VPet-Simulator.Windows/WinDesign/TalkBox.xaml
+++ b/VPet-Simulator.Windows/WinDesign/TalkBox.xaml
@@ -1,25 +1,27 @@
-<UserControl x:Class="VPet_Simulator.Windows.TalkBox"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<UserControl x:Class="VPet_Simulator.Windows.TalkBox" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Height="500"  Width="500">
+        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Height="500" Width="500">
     <Border Background="{DynamicResource PrimaryLighter}" BorderBrush="{DynamicResource Primary}" BorderThickness="5"
             VerticalAlignment="Top" Margin="5,50,5,5" CornerRadius="5" Padding="5">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="5"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="4*" />
+                <ColumnDefinition Width="5" />
+                <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
             <TextBox x:Name="tbTalk" Style="{DynamicResource StandardTextBoxStyle}" Height="Auto"
-                     pu:TextBoxHelper.Watermark="和桌宠说" FontSize="30" AcceptsReturn="True" TextWrapping="WrapWithOverflow"/>
+                    pu:TextBoxHelper.Watermark="和桌宠说" FontSize="30" AcceptsReturn="True" TextWrapping="WrapWithOverflow"
+                    PreviewKeyDown="tbTalk_KeyDown" />
             <Button pu:ButtonHelper.CornerRadius="4" Content="发送" BorderThickness="2"
-                                    Background="{DynamicResource SecondaryLight}" Grid.Column="2" BorderBrush="{DynamicResource DARKPrimaryDarker}" 
-                    FontSize="30" Click="SendMessage_Click" />
-            <Button x:Name="btn_startup" pu:ButtonHelper.CornerRadius="4" Content="初始化桌宠聊天程序" BorderThickness="2" x:FieldModifier="public"
-                                    Background="{DynamicResource SecondaryLight}" BorderBrush="{DynamicResource DARKPrimaryDarker}" 
-                    FontSize="30" Click="StartUP_Click" Grid.ColumnSpan="3" />
+                    Background="{DynamicResource SecondaryLight}" Grid.Column="2"
+                    BorderBrush="{DynamicResource DARKPrimaryDarker}" FontSize="30" Click="SendMessage_Click"
+                    ToolTip="按 Ctrl+Enter 发送" />
+            <Button x:Name="btn_startup" pu:ButtonHelper.CornerRadius="4" Content="初始化桌宠聊天程序" BorderThickness="2"
+                    x:FieldModifier="public" Background="{DynamicResource SecondaryLight}"
+                    BorderBrush="{DynamicResource DARKPrimaryDarker}" FontSize="30" Click="StartUP_Click"
+                    Grid.ColumnSpan="3" />
         </Grid>
     </Border>
 </UserControl>
diff --git a/VPet-Simulator.Windows/WinDesign/TalkBox.xaml.cs b/VPet-Simulator.Windows/WinDesign/TalkBox.xaml.cs
index 4eb9db2..7723a26 100644
--- a/VPet-Simulator.Windows/WinDesign/TalkBox.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/TalkBox.xaml.cs
@@ -225,5 +225,14 @@ namespace VPet_Simulator.Windows
                     Dispatcher.Invoke(() => btn_startup.Visibility = Visibility.Collapsed);
             });
         }
+
+        private void tbTalk_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter && e.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Control))
+            {
+                SendMessage_Click(sender, e);
+                e.Handled = true;
+            }
+        }
     }
 }
diff --git a/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml b/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml
index 52b8ba0..0580b9e 100644
--- a/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml
+++ b/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml
@@ -3,20 +3,21 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Height="500"  Width="500">
-    <Border Background="{DynamicResource SecondaryLighter}" BorderBrush="{DynamicResource Secondary}" BorderThickness="5"
-            VerticalAlignment="Top" Margin="5,50,5,5" CornerRadius="5" Padding="5">
+        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Height="500" Width="500">
+    <Border Background="{DynamicResource SecondaryLighter}" BorderBrush="{DynamicResource Secondary}"
+            BorderThickness="5" VerticalAlignment="Top" Margin="5,50,5,5" CornerRadius="5" Padding="5">
         <Grid>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="4*"/>
-                <ColumnDefinition Width="5"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="4*" />
+                <ColumnDefinition Width="5" />
+                <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
             <TextBox x:Name="tbTalk" Style="{DynamicResource StandardTextBoxStyle}" Height="Auto"
-                     pu:TextBoxHelper.Watermark="和桌宠说" FontSize="30" AcceptsReturn="True" TextWrapping="WrapWithOverflow"/>
+                    pu:TextBoxHelper.Watermark="和桌宠说" FontSize="30" AcceptsReturn="True" TextWrapping="WrapWithOverflow"
+                    PreviewKeyDown="tbTalk_KeyDown" />
             <Button pu:ButtonHelper.CornerRadius="4" Content="发送" BorderThickness="2"
-                    Background="{DynamicResource PrimaryLight}" Grid.Column="2" BorderBrush="{DynamicResource DARKPrimaryDarker}" 
-                    FontSize="30" Click="SendMessage_Click" />
+                    Background="{DynamicResource PrimaryLight}" Grid.Column="2" ToolTip="按 Ctrl+Enter 发送"
+                    BorderBrush="{DynamicResource DARKPrimaryDarker}" FontSize="30" Click="SendMessage_Click" />
         </Grid>
     </Border>
 </UserControl>
diff --git a/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml.cs b/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml.cs
index 50ef3a1..caffc5c 100644
--- a/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml.cs
+++ b/VPet-Simulator.Windows/WinDesign/TalkBoxAPI.xaml.cs
@@ -74,9 +74,23 @@ namespace VPet_Simulator.Windows
             }
             catch (Exception exp)
             {
-                m.Say("API调用失败,请检查设置和网络连接\n" + exp.ToString(), GraphCore.Helper.SayType.Serious);
+                var e = exp.ToString();
+                string str = "请检查设置和网络连接";
+                if (e.Contains("401"))
+                {
+                    str = "请检查API token设置";
+                }
+                m.Say($"API调用失败,{str}\n{e}", GraphCore.Helper.SayType.Serious);
             }
             Dispatcher.Invoke(() => this.IsEnabled = true);
         }
+        private void tbTalk_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter && e.KeyboardDevice.Modifiers.HasFlag(ModifierKeys.Control))
+            {
+                SendMessage_Click(sender, e);
+                e.Handled = true;
+            }
+        }
     }
 }