Browse Source

微课修改快捷键

master
张剑 2 years ago
parent
commit
cb4f6fcb81

+ 1
- 1
XHWK.WKTool/CountdownWindow.xaml View File

39
             Margin="0,450,0,0"
39
             Margin="0,450,0,0"
40
             HorizontalContentAlignment="Center"
40
             HorizontalContentAlignment="Center"
41
             VerticalContentAlignment="Center"
41
             VerticalContentAlignment="Center"
42
-            Content="开始/暂停:Ctrl+F5     停止:Ctrl+S"
42
+            Content="开始/暂停:Ctrl+F5     停止:Ctrl+F6"
43
             FontSize="26"
43
             FontSize="26"
44
             FontWeight="Bold"
44
             FontWeight="Bold"
45
             Foreground="#FFFFFF"
45
             Foreground="#FFFFFF"

+ 17
- 34
XHWK.WKTool/MainWindow.xaml View File

351
                                 Button.Template="{DynamicResource SkinBtnRecord}"
351
                                 Button.Template="{DynamicResource SkinBtnRecord}"
352
                                 Click="BtnRecord_Click"
352
                                 Click="BtnRecord_Click"
353
                                 Cursor="Hand"
353
                                 Cursor="Hand"
354
-                                FontSize="14"
355
-                                 />
354
+                                FontSize="14" />
356
                             <Button
355
                             <Button
357
                                 x:Name="BtnRecordSuspend"
356
                                 x:Name="BtnRecordSuspend"
358
                                 Margin="5,0"
357
                                 Margin="5,0"
362
                                 Click="BtnRecord_Click"
361
                                 Click="BtnRecord_Click"
363
                                 Cursor="Hand"
362
                                 Cursor="Hand"
364
                                 FontSize="14"
363
                                 FontSize="14"
365
-                                
366
                                 Visibility="Collapsed" />
364
                                 Visibility="Collapsed" />
367
                         </Grid>
365
                         </Grid>
368
                         <Grid Name="stop_grid" Grid.Column="3">
366
                         <Grid Name="stop_grid" Grid.Column="3">
374
                                 Button.Template="{DynamicResource SkinBtnRecordStop}"
372
                                 Button.Template="{DynamicResource SkinBtnRecordStop}"
375
                                 Click="BtnStop_Click"
373
                                 Click="BtnStop_Click"
376
                                 Cursor="Hand"
374
                                 Cursor="Hand"
377
-                                FontSize="14"
378
-                                 />
375
+                                FontSize="14" />
379
                         </Grid>
376
                         </Grid>
380
                     </Grid>
377
                     </Grid>
381
 
378
 
394
                             Button.Template="{DynamicResource SkinBtnClose}"
391
                             Button.Template="{DynamicResource SkinBtnClose}"
395
                             Click="BtnClose_Click"
392
                             Click="BtnClose_Click"
396
                             Cursor="Hand"
393
                             Cursor="Hand"
397
-                            FontSize="14"
398
-                             />
394
+                            FontSize="14" />
399
                     </Grid>
395
                     </Grid>
400
                     <!--  测试  -->
396
                     <!--  测试  -->
401
                     <Grid Grid.Column="2" Visibility="Collapsed">
397
                     <Grid Grid.Column="2" Visibility="Collapsed">
410
                             VerticalAlignment="Center"
406
                             VerticalAlignment="Center"
411
                             Click="BtnClose_Click"
407
                             Click="BtnClose_Click"
412
                             Cursor="Hand"
408
                             Cursor="Hand"
413
-                            FontSize="16"
414
-                            >
409
+                            FontSize="16">
415
                             <Button.Template>
410
                             <Button.Template>
416
                                 <ControlTemplate TargetType="{x:Type Button}">
411
                                 <ControlTemplate TargetType="{x:Type Button}">
417
                                     <Grid>
412
                                     <Grid>
534
                                 Button.Template="{DynamicResource SkinBtnScreenshot}"
529
                                 Button.Template="{DynamicResource SkinBtnScreenshot}"
535
                                 Click="BtnScreenshot_Click"
530
                                 Click="BtnScreenshot_Click"
536
                                 Cursor="Hand"
531
                                 Cursor="Hand"
537
-                                FontSize="16"
538
-                                 />
532
+                                FontSize="16" />
539
                         </Grid>
533
                         </Grid>
540
                         <!--  导入  -->
534
                         <!--  导入  -->
541
                         <Grid Grid.Row="3">
535
                         <Grid Grid.Row="3">
546
                                 Button.Template="{DynamicResource SkinBtnImport}"
540
                                 Button.Template="{DynamicResource SkinBtnImport}"
547
                                 Click="BtnImport_Click"
541
                                 Click="BtnImport_Click"
548
                                 Cursor="Hand"
542
                                 Cursor="Hand"
549
-                                FontSize="16"
550
-                                 />
543
+                                FontSize="16" />
551
                         </Grid>
544
                         </Grid>
552
                         <!--  加页  -->
545
                         <!--  加页  -->
553
                         <Grid Grid.Row="4">
546
                         <Grid Grid.Row="4">
558
                                 Button.Template="{DynamicResource SkinBtnAdd}"
551
                                 Button.Template="{DynamicResource SkinBtnAdd}"
559
                                 Click="BtnAdd_Click"
552
                                 Click="BtnAdd_Click"
560
                                 Cursor="Hand"
553
                                 Cursor="Hand"
561
-                                FontSize="16"
562
-                                 />
554
+                                FontSize="16" />
563
                         </Grid>
555
                         </Grid>
564
                         <!--  打印  -->
556
                         <!--  打印  -->
565
                         <Grid Grid.Row="5">
557
                         <Grid Grid.Row="5">
570
                                 Button.Template="{DynamicResource SkinBtnPrint}"
562
                                 Button.Template="{DynamicResource SkinBtnPrint}"
571
                                 Click="BtnPrint_Click"
563
                                 Click="BtnPrint_Click"
572
                                 Cursor="Hand"
564
                                 Cursor="Hand"
573
-                                FontSize="16"
574
-                                 />
565
+                                FontSize="16" />
575
                         </Grid>
566
                         </Grid>
576
                         <!--  我的  -->
567
                         <!--  我的  -->
577
                         <Grid Grid.Row="6">
568
                         <Grid Grid.Row="6">
582
                                 Button.Template="{DynamicResource SkinBtnMy}"
573
                                 Button.Template="{DynamicResource SkinBtnMy}"
583
                                 Click="BtnUpload_Click"
574
                                 Click="BtnUpload_Click"
584
                                 Cursor="Hand"
575
                                 Cursor="Hand"
585
-                                FontSize="16"
586
-                                 />
576
+                                FontSize="16" />
587
                         </Grid>
577
                         </Grid>
588
                         <!--  检测  -->
578
                         <!--  检测  -->
589
                         <Grid Grid.Row="7">
579
                         <Grid Grid.Row="7">
594
                                 Button.Template="{DynamicResource SkinBtnDevice}"
584
                                 Button.Template="{DynamicResource SkinBtnDevice}"
595
                                 Click="BtnDevice_Click"
585
                                 Click="BtnDevice_Click"
596
                                 Cursor="Hand"
586
                                 Cursor="Hand"
597
-                                FontSize="16"
598
-                                 />
587
+                                FontSize="16" />
599
                         </Grid>
588
                         </Grid>
600
                         <!--  设置  -->
589
                         <!--  设置  -->
601
                         <Grid Grid.Row="8">
590
                         <Grid Grid.Row="8">
606
                                 Button.Template="{DynamicResource SkinBtnSetUp}"
595
                                 Button.Template="{DynamicResource SkinBtnSetUp}"
607
                                 Click="BtnSetUp_Click"
596
                                 Click="BtnSetUp_Click"
608
                                 Cursor="Hand"
597
                                 Cursor="Hand"
609
-                                FontSize="16"
610
-                                 />
598
+                                FontSize="16" />
611
                         </Grid>
599
                         </Grid>
612
                         <!--  测试  -->
600
                         <!--  测试  -->
613
                         <Grid
601
                         <Grid
620
                                 VerticalAlignment="Stretch"
608
                                 VerticalAlignment="Stretch"
621
                                 Click="BtnSetUp_Click"
609
                                 Click="BtnSetUp_Click"
622
                                 Cursor="Hand"
610
                                 Cursor="Hand"
623
-                                FontSize="18"
624
-                                >
611
+                                FontSize="18">
625
                                 <Button.Template>
612
                                 <Button.Template>
626
                                     <ControlTemplate TargetType="{x:Type Button}">
613
                                     <ControlTemplate TargetType="{x:Type Button}">
627
                                         <Grid>
614
                                         <Grid>
918
                                         Width="28"
905
                                         Width="28"
919
                                         Height="20"
906
                                         Height="20"
920
                                         Click="last_button_Click"
907
                                         Click="last_button_Click"
921
-                                        Cursor="Hand"
922
-                                        >
908
+                                        Cursor="Hand">
923
                                         <StackPanel>
909
                                         <StackPanel>
924
                                             <Image
910
                                             <Image
925
                                                 Width="16"
911
                                                 Width="16"
964
                                         Height="20"
950
                                         Height="20"
965
                                         Background="Transparent"
951
                                         Background="Transparent"
966
                                         Click="next_btn_Click"
952
                                         Click="next_btn_Click"
967
-                                        Cursor="Hand"
968
-                                        >
953
+                                        Cursor="Hand">
969
                                         <StackPanel>
954
                                         <StackPanel>
970
                                             <Image
955
                                             <Image
971
                                                 Width="16"
956
                                                 Width="16"
1230
                                                 HorizontalAlignment="Stretch"
1215
                                                 HorizontalAlignment="Stretch"
1231
                                                 VerticalAlignment="Center"
1216
                                                 VerticalAlignment="Center"
1232
                                                 Click="BtnSkinWhite_Click"
1217
                                                 Click="BtnSkinWhite_Click"
1233
-                                                Cursor="Hand"
1234
-                                                >
1218
+                                                Cursor="Hand">
1235
                                                 <Button.Template>
1219
                                                 <Button.Template>
1236
                                                     <ControlTemplate TargetType="{x:Type Button}">
1220
                                                     <ControlTemplate TargetType="{x:Type Button}">
1237
                                                         <StackPanel>
1221
                                                         <StackPanel>
1261
                                                 HorizontalAlignment="Stretch"
1245
                                                 HorizontalAlignment="Stretch"
1262
                                                 VerticalAlignment="Center"
1246
                                                 VerticalAlignment="Center"
1263
                                                 Click="BtnSkinTechnologyBlue_Click"
1247
                                                 Click="BtnSkinTechnologyBlue_Click"
1264
-                                                Cursor="Hand"
1265
-                                                >
1248
+                                                Cursor="Hand">
1266
                                                 <Button.Template>
1249
                                                 <Button.Template>
1267
                                                     <ControlTemplate TargetType="{x:Type Button}">
1250
                                                     <ControlTemplate TargetType="{x:Type Button}">
1268
                                                         <StackPanel>
1251
                                                         <StackPanel>
1607
                                             VerticalAlignment="Center"
1590
                                             VerticalAlignment="Center"
1608
                                             FontSize="16"
1591
                                             FontSize="16"
1609
                                             Foreground="#FF666666"
1592
                                             Foreground="#FF666666"
1610
-                                            Text="开始/暂停:Ctrl+F5     停止:Ctrl+S     退出讲评:鼠标右键" />
1593
+                                            Text="开始/暂停:Ctrl+F5  停止:Ctrl+F6     退出讲评:鼠标右键" />
1611
                                     </Grid>
1594
                                     </Grid>
1612
                                     <Grid Grid.Row="2" Grid.Column="0">
1595
                                     <Grid Grid.Row="2" Grid.Column="0">
1613
                                         <TextBlock
1596
                                         <TextBlock

+ 1
- 1
XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs View File

156
                 //开始,暂停
156
                 //开始,暂停
157
                 BtnRecordingScreen_Click(null, null);
157
                 BtnRecordingScreen_Click(null, null);
158
             }
158
             }
159
-            if (e.KeyValue == (int)Keys.S && (int)Control.ModifierKeys == (int)Keys.Control)
159
+            if (e.KeyValue == (int)Keys.F6 && (int)Control.ModifierKeys == (int)Keys.Control)
160
             {
160
             {
161
                 //结束
161
                 //结束
162
                 BtnStopRecordingScreen_Click(null, null);
162
                 BtnStopRecordingScreen_Click(null, null);

Loading…
Cancel
Save