微课修改快捷键

XHWK.WKTool/CountdownWindow.xaml

@@ -39,7 +39,7 @@
             Margin="0,450,0,0"
             HorizontalContentAlignment="Center"
             VerticalContentAlignment="Center"
-            Content="开始/暂停：Ctrl+F5     停止：Ctrl+S"
+            Content="开始/暂停：Ctrl+F5     停止：Ctrl+F6"
             FontSize="26"
             FontWeight="Bold"
             Foreground="#FFFFFF"

XHWK.WKTool/MainWindow.xaml

@@ -351,8 +351,7 @@
                                 Button.Template="{DynamicResource SkinBtnRecord}"
                                 Click="BtnRecord_Click"
                                 Cursor="Hand"
-                                FontSize="14"
-                                 />
+                                FontSize="14" />
                             <Button
                                 x:Name="BtnRecordSuspend"
                                 Margin="5,0"
@@ -362,7 +361,6 @@
                                 Click="BtnRecord_Click"
                                 Cursor="Hand"
                                 FontSize="14"
-                                
                                 Visibility="Collapsed" />
                         </Grid>
                         <Grid Name="stop_grid" Grid.Column="3">
@@ -374,8 +372,7 @@
                                 Button.Template="{DynamicResource SkinBtnRecordStop}"
                                 Click="BtnStop_Click"
                                 Cursor="Hand"
-                                FontSize="14"
-                                 />
+                                FontSize="14" />
                         </Grid>
                     </Grid>
 
@@ -394,8 +391,7 @@
                             Button.Template="{DynamicResource SkinBtnClose}"
                             Click="BtnClose_Click"
                             Cursor="Hand"
-                            FontSize="14"
-                             />
+                            FontSize="14" />
                     </Grid>
                     <!--  测试  -->
                     <Grid Grid.Column="2" Visibility="Collapsed">
@@ -410,8 +406,7 @@
                             VerticalAlignment="Center"
                             Click="BtnClose_Click"
                             Cursor="Hand"
-                            FontSize="16"
-                            >
+                            FontSize="16">
                             <Button.Template>
                                 <ControlTemplate TargetType="{x:Type Button}">
                                     <Grid>
@@ -534,8 +529,7 @@
                                 Button.Template="{DynamicResource SkinBtnScreenshot}"
                                 Click="BtnScreenshot_Click"
                                 Cursor="Hand"
-                                FontSize="16"
-                                 />
+                                FontSize="16" />
                         </Grid>
                         <!--  导入  -->
                         <Grid Grid.Row="3">
@@ -546,8 +540,7 @@
                                 Button.Template="{DynamicResource SkinBtnImport}"
                                 Click="BtnImport_Click"
                                 Cursor="Hand"
-                                FontSize="16"
-                                 />
+                                FontSize="16" />
                         </Grid>
                         <!--  加页  -->
                         <Grid Grid.Row="4">
@@ -558,8 +551,7 @@
                                 Button.Template="{DynamicResource SkinBtnAdd}"
                                 Click="BtnAdd_Click"
                                 Cursor="Hand"
-                                FontSize="16"
-                                 />
+                                FontSize="16" />
                         </Grid>
                         <!--  打印  -->
                         <Grid Grid.Row="5">
@@ -570,8 +562,7 @@
                                 Button.Template="{DynamicResource SkinBtnPrint}"
                                 Click="BtnPrint_Click"
                                 Cursor="Hand"
-                                FontSize="16"
-                                 />
+                                FontSize="16" />
                         </Grid>
                         <!--  我的  -->
                         <Grid Grid.Row="6">
@@ -582,8 +573,7 @@
                                 Button.Template="{DynamicResource SkinBtnMy}"
                                 Click="BtnUpload_Click"
                                 Cursor="Hand"
-                                FontSize="16"
-                                 />
+                                FontSize="16" />
                         </Grid>
                         <!--  检测  -->
                         <Grid Grid.Row="7">
@@ -594,8 +584,7 @@
                                 Button.Template="{DynamicResource SkinBtnDevice}"
                                 Click="BtnDevice_Click"
                                 Cursor="Hand"
-                                FontSize="16"
-                                 />
+                                FontSize="16" />
                         </Grid>
                         <!--  设置  -->
                         <Grid Grid.Row="8">
@@ -606,8 +595,7 @@
                                 Button.Template="{DynamicResource SkinBtnSetUp}"
                                 Click="BtnSetUp_Click"
                                 Cursor="Hand"
-                                FontSize="16"
-                                 />
+                                FontSize="16" />
                         </Grid>
                         <!--  测试  -->
                         <Grid
@@ -620,8 +608,7 @@
                                 VerticalAlignment="Stretch"
                                 Click="BtnSetUp_Click"
                                 Cursor="Hand"
-                                FontSize="18"
-                                >
+                                FontSize="18">
                                 <Button.Template>
                                     <ControlTemplate TargetType="{x:Type Button}">
                                         <Grid>
@@ -918,8 +905,7 @@
                                         Width="28"
                                         Height="20"
                                         Click="last_button_Click"
-                                        Cursor="Hand"
-                                        >
+                                        Cursor="Hand">
                                         <StackPanel>
                                             <Image
                                                 Width="16"
@@ -964,8 +950,7 @@
                                         Height="20"
                                         Background="Transparent"
                                         Click="next_btn_Click"
-                                        Cursor="Hand"
-                                        >
+                                        Cursor="Hand">
                                         <StackPanel>
                                             <Image
                                                 Width="16"
@@ -1230,8 +1215,7 @@
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Center"
                                                 Click="BtnSkinWhite_Click"
-                                                Cursor="Hand"
-                                                >
+                                                Cursor="Hand">
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
@@ -1261,8 +1245,7 @@
                                                 HorizontalAlignment="Stretch"
                                                 VerticalAlignment="Center"
                                                 Click="BtnSkinTechnologyBlue_Click"
-                                                Cursor="Hand"
-                                                >
+                                                Cursor="Hand">
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
@@ -1607,7 +1590,7 @@
                                             VerticalAlignment="Center"
                                             FontSize="16"
                                             Foreground="#FF666666"
-                                            Text="开始/暂停：Ctrl+F5     停止：Ctrl+S     退出讲评：鼠标右键" />
+                                            Text="开始/暂停：Ctrl+F5  停止：Ctrl+F6     退出讲评：鼠标右键" />
                                     </Grid>
                                     <Grid Grid.Row="2" Grid.Column="0">
                                         <TextBlock

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -156,7 +156,7 @@ namespace XHWK.WKTool
                 //开始，暂停
                 BtnRecordingScreen_Click(null, null);
             }
-            if (e.KeyValue == (int)Keys.S && (int)Control.ModifierKeys == (int)Keys.Control)
+            if (e.KeyValue == (int)Keys.F6 && (int)Control.ModifierKeys == (int)Keys.Control)
             {
                 //结束
                 BtnStopRecordingScreen_Click(null, null);