综合-调整新手引导文案；调整底部工具栏按钮样式；取消远程控制

PDF Office/CustomControl/PageTurningPreview.xaml

@@ -57,28 +57,16 @@
                     HorizontalAlignment="Left"
                     HorizontalContentAlignment="Center"
                     VerticalContentAlignment="Center"
-                    Background="{StaticResource color.field.bg.def}"
-                    BorderBrush="{StaticResource color.field.border.norm}"
                     Click="PrePage_Click"
-                    FontSize="16">
+                    FontSize="16"
+                    Style="{StaticResource btn.selector}">
                     <Path
                         Width="24"
                         Height="24"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Data="M10.0607 12.1L14.6303 7.53039L13.5696 6.46973L8.46967 11.5697C8.17678 11.8626 8.17678 12.3374 8.46967 12.6303L13.5696 17.7303L14.6303 16.6696L10.0607 12.1Z"
-                        Fill="#616469" />
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
+                        Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
                 </Button>
                 <TextBox
                     x:Name="CurrentPage"
@@ -118,28 +106,16 @@
                     Height="24"
                     HorizontalContentAlignment="Center"
                     VerticalContentAlignment="Center"
-                    Background="{StaticResource color.field.bg.def}"
-                    BorderBrush="{StaticResource color.field.border.norm}"
                     Click="NextPage_Click"
-                    FontSize="16">
+                    FontSize="16"
+                    Style="{StaticResource btn.selector}">
                     <Path
                         Width="24"
                         Height="24"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Data="M13.9393 12.1L9.36972 7.53039L10.4304 6.46973L15.5303 11.5697C15.8232 11.8626 15.8232 12.3374 15.5303 12.6303L10.4304 17.7303L9.36972 16.6696L13.9393 12.1Z"
-                        Fill="#616469" />
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="4">
-                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-                            </Border>
-                        </ControlTemplate>
-                    </Button.Template>
+                        Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
                 </Button>
             </StackPanel>
         </StackPanel>

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -518,10 +518,10 @@
           <target state="new">Scanners</target>
         </trans-unit>
         <trans-unit id="GuidContentP1" translate="yes" xml:space="preserve">
-          <source>Enjoy All Advanced Features!
+          <source>PDF Master Beta Invites You to Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</source>
-          <target state="new">Enjoy All Advanced Features!
+          <target state="new">PDF Master Beta Invites You to Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</target>
         </trans-unit>

PDF Office/MultilingualResources/PDF Office.zh-Hans.xlf

@@ -518,10 +518,10 @@
           <target state="new">Scanners</target>
         </trans-unit>
         <trans-unit id="GuidContentP1" translate="yes" xml:space="preserve">
-          <source>Enjoy All Advanced Features!
+          <source>PDF Master Beta Invites You to Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</source>
-          <target state="new">Enjoy All Advanced Features!
+          <target state="new">PDF Master Beta Invites You to Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</target>
         </trans-unit>

PDF Office/MultilingualResources/PDF Office.zh-Hant.xlf

@@ -518,10 +518,10 @@
           <target state="new">Scanners</target>
         </trans-unit>
         <trans-unit id="GuidContentP1" translate="yes" xml:space="preserve">
-          <source>Enjoy All Advanced Features!
+          <source>PDF Master Beta Invites You to Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</source>
-          <target state="new">Enjoy All Advanced Features!
+          <target state="new">PDF Master Beta Invites You to Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</target>
         </trans-unit>

PDF Office/Strings/HomePage/HomePage.Designer.cs

@@ -97,7 +97,7 @@ namespace PDF_Master.Strings.HomePage {
         }
         
         /// <summary>
-        ///   查找类似 Enjoy All Advanced Features!
+        ///   查找类似 PDF Master Beta Invites You to Enjoy All Advanced Features!
         ///
         ///View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity. 的本地化字符串。
         /// </summary>

PDF Office/Strings/HomePage/HomePage.resx

@@ -124,7 +124,7 @@
     <value>Scan</value>
   </data>
   <data name="GuidContentP1" xml:space="preserve">
-    <value>Enjoy All Advanced Features!
+    <value>PDF Master Beta Invites You to Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Master to boost your productivity.</value>
   </data>

PDF Office/Styles/ButtonStyle.xaml

@@ -639,8 +639,9 @@
                 <Setter Property="BorderBrush" Value="{StaticResource color.field.border.norm}" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Background" Value="{StaticResource color.field.border.dis}" />
+                <Setter Property="Background" Value="{StaticResource color.field.bg.dis}" />
                 <Setter Property="BorderBrush" Value="{StaticResource color.field.border.norm}" />
+                <Setter Property="Foreground" Value="{StaticResource color.icon.base.neutral.dis}" />
             </Trigger>
         </Style.Triggers>
     </Style>

PDF Office/ViewModels/Dialog/NoviceGuidDialogViewModel.cs

@@ -161,7 +161,8 @@ namespace PDF_Master.ViewModels.Dialog
             ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_Office.png", Title = App.HomePageLoader.GetString("GuidTitleP1"), Content = string.Format(App.HomePageLoader.GetString("GuidContentP1"),trialDays) }) ;
             ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_Annote.png", Title = App.HomePageLoader.GetString("GuidTitleP2"), Content =App.HomePageLoader.GetString("GuidContentP2") });
             ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_Convert.png", Title = App.HomePageLoader.GetString("GuidTitleP3"), Content = App.HomePageLoader.GetString("GuidContentP3") });
-            ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_FillAndSign.png", Title = App.HomePageLoader.GetString("GuidTitleP4"), Content = App.HomePageLoader.GetString("GuidContentP4") });
+            //因填写与签名功能暂时不上，隐藏新手引导宣传页
+            //ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_FillAndSign.png", Title = App.HomePageLoader.GetString("GuidTitleP4"), Content = App.HomePageLoader.GetString("GuidContentP4") });
             ItemSource.Add(new GuidItemModel() { ImageSource = "pack://application:,,,/PDF Master;component/Resources/GuidItems/Guid_SignUp.png", Title = App.HomePageLoader.GetString("GuidTitleP5"), Content = App.HomePageLoader.GetString("GuidContentP5") });
         }
 

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -358,6 +358,7 @@ namespace PDF_Master.ViewModels
                 ));
 
                 App.IsFirstOpen = false;
+                //因为远程广告模块没有时间测试正式环境，暂时取消
                 ADServiceHelper.GetAD("PDFMasterWindows");
 
 

PDF Office/Views/BOTA/OutLineControl.xaml

@@ -9,8 +9,8 @@
     xmlns:mainPageLoader="clr-namespace:PDF_Master.Strings.MainPage"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:model="clr-namespace:PDF_Master.Model.BOTA"
-    Width="400"
     d:DataContext="{d:DesignInstance Type=bota:OutLineControlViewModel}"
+    d:DesignWidth="400"
     KeyDown="UserControl_KeyDown"
     mc:Ignorable="d">
     <UserControl.Resources>

PDF Office/Views/BottomToolContent.xaml

@@ -99,7 +99,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Data="M16.4056 7.40441L11.8105 11.9995L16.4056 16.5945L15.3449 17.6552L10.2196 12.5298C9.92666 12.2369 9.92666 11.762 10.2196 11.4691L15.3449 6.34375L16.4056 7.40441ZM7.25 6.5V17.5H8.75V6.5H7.25Z"
-                    Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
+                    Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
             </Button>
             <Button
                 Width="24"
@@ -113,7 +113,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Data="M10.0607 12.1L14.6303 7.53039L13.5696 6.46973L8.46967 11.5697C8.17678 11.8626 8.17678 12.3374 8.46967 12.6303L13.5696 17.7303L14.6303 16.6696L10.0607 12.1Z"
-                    Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
+                    Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
             </Button>
             <cus:TextBoxEx
                 Width="57"
@@ -152,7 +152,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Data="M13.9393 12.1L9.36972 7.53039L10.4304 6.46973L15.5303 11.5697C15.8232 11.8626 15.8232 12.3374 15.5303 12.6303L10.4304 17.7303L9.36972 16.6696L13.9393 12.1Z"
-                    Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
+                    Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
             </Button>
             <Button
                 Width="24"
@@ -166,7 +166,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Data="M7.24968 7.40441L11.8447 11.9995L7.24968 16.5945L8.31034 17.6552L13.4357 12.5298C13.7286 12.2369 13.7286 11.762 13.4357 11.4691L8.31034 6.34375L7.24968 7.40441ZM16.4053 6.5V17.5H14.9053V6.5H16.4053Z"
-                    Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
+                    Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
             </Button>
 
             <Separator Margin="4,0,0,0" Style="{StaticResource VerticalSeparatorStyle}" />
@@ -181,7 +181,7 @@
                     Width="16"
                     Height="16"
                     Data="M2.56067 7.28028L5.7803 4.06066L4.71964 3L0.21967 7.49997C-0.0732233 7.79286 -0.0732233 8.26774 0.21967 8.56063L4.71964 13.0606L5.7803 11.9999L2.56065 8.78028L15.75 8.78029V7.28029L2.56067 7.28028Z"
-                    Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
+                    Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
             </Button>
             <Button
                 Width="24"
@@ -193,7 +193,7 @@
                     Width="16"
                     Height="16"
                     Data="M13.1893 8.78026L9.9697 11.9999L11.0304 13.0605L15.5303 8.56058C15.8232 8.26768 15.8232 7.79281 15.5303 7.49992L11.0304 2.99995L9.9697 4.06061L13.1894 7.28026L0 7.28026V8.78026L13.1893 8.78026Z"
-                    Fill="{StaticResource color.icon.base.neutral.norm.lv1}" />
+                    Fill="{Binding RelativeSource={RelativeSource AncestorType={x:Type Button}}, Path=Foreground}" />
             </Button>
         </StackPanel>
         <StackPanel

PDF Office/Views/HomeContent.xaml

@@ -47,7 +47,7 @@
             </DataTemplate>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
+    <Grid Background="{StaticResource color.sys.layout.mg}">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition />
@@ -57,7 +57,7 @@
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <!--  左侧菜单栏  -->
-        <StackPanel Background="{StaticResource color.sys.layout.mg}">
+        <StackPanel>
             <Button
                 x:Name="BtnOpenPDF"
                 Height="40"
@@ -182,7 +182,7 @@
             </customControl:CustomIconToggleBtn>
 
         </StackPanel>
-        <homePanel:PromotionContent Grid.Row="1" />
+        <homePanel:PromotionContent Grid.Row="1" Visibility="Collapsed" />
         <!--  右侧内容区域  -->
         <ContentControl
             Grid.RowSpan="2"