Ver código fonte

微课设置文字修改

master
张剑 1 ano atrás
pai
commit
7bb750bf6d
2 arquivos alterados com 23 adições e 16 exclusões
  1. 22
    13
      XHWK.WKTool/MainWindow.xaml
  2. 1
    3
      XHWK.WKTool/MainWindow.xaml.cs

+ 22
- 13
XHWK.WKTool/MainWindow.xaml Ver arquivo

@@ -414,7 +414,8 @@
414 414
                                     </Grid>
415 415
                                     <ControlTemplate.Triggers>
416 416
                                         <Trigger Property="IsMouseOver" Value="True">
417
-                                            <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
417
+                                            <Setter TargetName="ImgSetUp" Property="Source"
418
+                                                    Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
418 419
                                             <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
419 420
                                         </Trigger>
420 421
                                     </ControlTemplate.Triggers>
@@ -616,15 +617,20 @@
616 617
                                         </Grid>
617 618
                                         <ControlTemplate.Triggers>
618 619
                                             <Trigger Property="IsMouseOver" Value="True">
619
-                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_MI.png" />
620
+                                                <Setter TargetName="ImgScreenRecording" Property="Source"
621
+                                                        Value="/SkinImages/White/Toolbar_LP_MI.png" />
620 622
                                             </Trigger>
621 623
                                             <Trigger Property="IsPressed" Value="True">
622
-                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_CL.png" />
623
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFFFFFFF" />
624
+                                                <Setter TargetName="ImgScreenRecording" Property="Source"
625
+                                                        Value="/SkinImages/White/Toolbar_LP_CL.png" />
626
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
627
+                                                        Value="#FFFFFFFF" />
624 628
                                             </Trigger>
625 629
                                             <Trigger Property="IsEnabled" Value="False">
626
-                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_N.png" />
627
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFC3C3C3" />
630
+                                                <Setter TargetName="ImgScreenRecording" Property="Source"
631
+                                                        Value="/SkinImages/White/Toolbar_LP_N.png" />
632
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
633
+                                                        Value="#FFC3C3C3" />
628 634
                                             </Trigger>
629 635
                                         </ControlTemplate.Triggers>
630 636
                                     </ControlTemplate>
@@ -1194,11 +1200,13 @@
1194 1200
                                                 <Button.Template>
1195 1201
                                                     <ControlTemplate TargetType="{x:Type Button}">
1196 1202
                                                         <StackPanel>
1197
-                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_White.png" />
1203
+                                                            <Image x:Name="ImgRecord"
1204
+                                                                   Source="/SkinImages/Skin/Skin_White.png" />
1198 1205
                                                         </StackPanel>
1199 1206
                                                         <ControlTemplate.Triggers>
1200 1207
                                                             <Trigger Property="IsMouseOver" Value="True">
1201
-                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_White_MI.png" />
1208
+                                                                <Setter TargetName="ImgRecord" Property="Source"
1209
+                                                                        Value="/SkinImages/Skin/Skin_White_MI.png" />
1202 1210
                                                             </Trigger>
1203 1211
                                                         </ControlTemplate.Triggers>
1204 1212
                                                     </ControlTemplate>
@@ -1224,11 +1232,13 @@
1224 1232
                                                 <Button.Template>
1225 1233
                                                     <ControlTemplate TargetType="{x:Type Button}">
1226 1234
                                                         <StackPanel>
1227
-                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
1235
+                                                            <Image x:Name="ImgRecord"
1236
+                                                                   Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
1228 1237
                                                         </StackPanel>
1229 1238
                                                         <ControlTemplate.Triggers>
1230 1239
                                                             <Trigger Property="IsMouseOver" Value="True">
1231
-                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
1240
+                                                                <Setter TargetName="ImgRecord" Property="Source"
1241
+                                                                        Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
1232 1242
                                                             </Trigger>
1233 1243
                                                         </ControlTemplate.Triggers>
1234 1244
                                                     </ControlTemplate>
@@ -1333,7 +1343,7 @@
1333 1343
                                                 VerticalAlignment="Center"
1334 1344
                                                 FontSize="16"
1335 1345
                                                 Foreground="#333333"
1336
-                                                Text="摄像头位置" />
1346
+                                                Text="头像位置" />
1337 1347
                                         </Grid>
1338 1348
                                         <Grid Grid.Row="1" Grid.Column="3">
1339 1349
                                             <StackPanel
@@ -1579,13 +1589,12 @@
1579 1589
 
1580 1590
                                     <Grid Grid.Row="3" Grid.Column="0">
1581 1591
                                         <TextBlock
1582
-                                            x:Name="TxbVersion"
1583 1592
                                             Margin="0,0,0,0"
1584 1593
                                             HorizontalAlignment="Right"
1585 1594
                                             VerticalAlignment="Center"
1586 1595
                                             FontSize="16"
1587 1596
                                             Foreground="#FF666666"
1588
-                                            Text="正式版" />
1597
+                                            Text="版" />
1589 1598
                                     </Grid>
1590 1599
                                     <Grid Grid.Row="3" Grid.Column="1">
1591 1600
                                         <TextBlock

+ 1
- 3
XHWK.WKTool/MainWindow.xaml.cs Ver arquivo

@@ -120,7 +120,7 @@ namespace XHWK.WKTool
120 120
             APP.PageDrawList = new List<Model_DrawData>();
121 121
             Model_DrawData modelDrawData = new Model_DrawData { PageNum = APP.PageContextData.currpage };
122 122
             APP.PageDrawList.Add(modelDrawData);
123
-            Txbv.Text = "v" + FileToolsCommon.GetConfigValue("VersionName");
123
+            Txbv.Text = APP.isDebug ? "测试版" : "正式版" + " v" + FileToolsCommon.GetConfigValue("VersionName");
124 124
             TxbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoType");
125 125
             TxbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoSavePath");
126 126
             Initialize();
@@ -182,8 +182,6 @@ namespace XHWK.WKTool
182 182
         /// </summary>
183 183
         public void Initialize()
184 184
         {
185
-            TxbVersion.Text = APP.isDebug ? "测试版:" : "正式版:";
186
-
187 185
             #region 数据初始化
188 186
 
189 187
             string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";

Carregando…
Cancelar
Salvar