Ver Fonte

文案-补充部分文案

ZhouJieSheng há 1 ano atrás
pai
commit
1859df6c4f

+ 12 - 2
PDF Office/App.xaml.cs

@@ -86,9 +86,9 @@ namespace PDF_Master
         public static string CurrentPath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), Name);
 
         /// <summary>
-        /// 内嵌文档路径
+        /// 项目内嵌文档路径  实际打开文档时,会将改文档复制到Document 文件夹下,避免C盘文件无法写入的情况
         /// </summary>
-        public static string GuidPDFPath = Path.Combine(Environment.CurrentDirectory, "Resources\\GuidPDF\\Quick Start Guide.pdf");
+        public static string GuidPDFPath;
 
         /// <summary>
         /// 是否需要更新内嵌文档
@@ -323,6 +323,16 @@ namespace PDF_Master
                 {
                     info.Create();
                 }
+
+                //复制项目的新手引导文档到Document 目录
+                string guidfilePath = Path.Combine(CachePath.GuidPDFPath, "Quick Start Guide.pdf");
+                if(!File.Exists(guidfilePath)||App.IsGuidPDFUpdated)
+                {
+                    //Document 路径下没有内嵌文档或者内嵌文档版本更新时
+                    File.Copy(Path.Combine(Environment.CurrentDirectory, "Resources\\GuidPDF\\Quick Start Guide.pdf"), guidfilePath);
+                    GuidPDFPath = guidfilePath;
+                }
+                
             }
             catch (Exception ex)
             {

+ 13 - 0
PDF Office/Helper/CacheFilePath.cs

@@ -27,6 +27,11 @@ namespace PDF_Master.Helper
         List<string> SignatureStamp = new List<string> { "Signature", "Stamp" };
         List<string> MergeFile = new List<string> { "Temp" };
 
+        /// <summary>
+        /// Document路径下的新手引导文档
+        /// </summary>
+        List<string> GuidPDF = new List<string>() { "GuidPDF" };
+
         /// <summary>
         /// 扫描仪缓存文件夹路径
         /// </summary>
@@ -149,6 +154,14 @@ namespace PDF_Master.Helper
             }
         }
 
+        public string GuidPDFPath
+        {
+            get
+            {
+                return CreateCacheDirectory(GuidPDF);
+            }
+        }
+
         /// <summary>
         ///  在“文档”路径下创建缓存文件夹,传C:\Users\kdan\Documents\PDF Master 以后的文件夹名
         /// </summary>

+ 4 - 4
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 for Free for {0} Days!
+          <source>Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</source>
-          <target state="new">Enjoy All Advanced Features for Free for {0} Days!
+          <target state="new">Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</target>
         </trans-unit>
@@ -1490,9 +1490,9 @@ a document</target>
         </trans-unit>
         <trans-unit id="Convert_PDFToCSVEachForm" translate="yes" xml:space="preserve">
           <source>Create worksheets for each
-form</source>
+table</source>
           <target state="new">Create worksheets for each
-form</target>
+table</target>
           <note from="MultilingualBuild" annotates="source" priority="2">PDF转CSV-每个表格转为一个CSV文件</note>
         </trans-unit>
         <trans-unit id="Convert_PDFToCSVSettings" translate="yes" xml:space="preserve">

+ 4 - 4
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 for Free for {0} Days!
+          <source>Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</source>
-          <target state="new">Enjoy All Advanced Features for Free for {0} Days!
+          <target state="new">Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</target>
         </trans-unit>
@@ -1490,9 +1490,9 @@ a document</target>
         </trans-unit>
         <trans-unit id="Convert_PDFToCSVEachForm" translate="yes" xml:space="preserve">
           <source>Create worksheets for each
-form</source>
+table</source>
           <target state="new">Create worksheets for each
-form</target>
+table</target>
           <note from="MultilingualBuild" annotates="source" priority="2">PDF转CSV-每个表格转为一个CSV文件</note>
         </trans-unit>
         <trans-unit id="Convert_PDFToCSVSettings" translate="yes" xml:space="preserve">

+ 4 - 4
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 for Free for {0} Days!
+          <source>Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</source>
-          <target state="new">Enjoy All Advanced Features for Free for {0} Days!
+          <target state="new">Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</target>
         </trans-unit>
@@ -1490,9 +1490,9 @@ a document</target>
         </trans-unit>
         <trans-unit id="Convert_PDFToCSVEachForm" translate="yes" xml:space="preserve">
           <source>Create worksheets for each
-form</source>
+table</source>
           <target state="new">Create worksheets for each
-form</target>
+table</target>
           <note from="MultilingualBuild" annotates="source" priority="2">PDF转CSV-每个表格转为一个CSV文件</note>
         </trans-unit>
         <trans-unit id="Convert_PDFToCSVSettings" translate="yes" xml:space="preserve">

+ 1 - 1
PDF Office/Strings/HomePage/HomePage.Designer.cs

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

+ 1 - 1
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 for Free for {0} Days!
+    <value>Enjoy All Advanced Features!
 
 View, Annotate, Fill and Convert PDFs with PDF Office to boost your productivity.</value>
   </data>

+ 1 - 1
PDF Office/Strings/MainPage/MainPage.Designer.cs

@@ -468,7 +468,7 @@ namespace PDF_Master.Strings.MainPage {
         
         /// <summary>
         ///   查找类似 Create worksheets for each
-        ///form 的本地化字符串。
+        ///table 的本地化字符串。
         /// </summary>
         public static string Convert_PDFToCSVEachForm {
             get {

+ 1 - 1
PDF Office/Strings/MainPage/MainPage.resx

@@ -263,7 +263,7 @@ a document</value>
   </data>
   <data name="Convert_PDFToCSVEachForm" xml:space="preserve">
     <value>Create worksheets for each
-form</value>
+table</value>
     <comment>PDF转CSV-每个表格转为一个CSV文件</comment>
   </data>
   <data name="Convert_PDFToCSVSettings" xml:space="preserve">

+ 40 - 36
PDF Office/Views/BOTA/OutLineControl.xaml

@@ -6,9 +6,9 @@
     xmlns:customcontrol="clr-namespace:PDF_Master.CustomControl"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:PDF_Master.Views.BOTA"
+    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"
-    xmlns:mainPageLoader="clr-namespace:PDF_Master.Strings.MainPage"
     d:DataContext="{d:DesignInstance Type=bota:OutLineControlViewModel}"
     KeyDown="UserControl_KeyDown"
     mc:Ignorable="d">
@@ -19,16 +19,19 @@
             </ResourceDictionary.MergedDictionaries>
 
             <ContextMenu x:Key="OutLineItemMenu">
-                <MenuItem x:Name="AddMenu"
-                          Click="AddMenu_Click"
-                          Header="{x:Static mainPageLoader:MainPage.Outline_Add}" />
-                <MenuItem x:Name="AddChlidMenu"
-                          Click="AddChlidMenu_Click"
-                          Header="{x:Static mainPageLoader:MainPage.Outline_AddSub}" />
-                <MenuItem x:Name="AddParentMenu" 
-                          Click="AddParentMenu_Click"  
-                          Header="{x:Static mainPageLoader:MainPage.Outline_AddLevel}"
-                          IsEnabled="{Binding CanAddParent}" />
+                <MenuItem
+                    x:Name="AddMenu"
+                    Click="AddMenu_Click"
+                    Header="{x:Static mainPageLoader:MainPage.Outline_Add}" />
+                <MenuItem
+                    x:Name="AddChlidMenu"
+                    Click="AddChlidMenu_Click"
+                    Header="{x:Static mainPageLoader:MainPage.Outline_AddSub}" />
+                <MenuItem
+                    x:Name="AddParentMenu"
+                    Click="AddParentMenu_Click"
+                    Header="{x:Static mainPageLoader:MainPage.Outline_AddLevel}"
+                    IsEnabled="{Binding CanAddParent}" />
 
                 <MenuItem
                     x:Name="DeleteMenu"
@@ -56,17 +59,18 @@
                     IsEnabled="{Binding CanDown}" />
             </ContextMenu>
             <!--  圆角 https://wpf.2000things.com/2012/05/11/556-clipping-to-a-border-using-an-opacity-mask  -->
-            <ToolTip x:Key="OutLineItemToolTip"
-                                        Width="320"
-                                        Height="120"
-                                        Closed="ToolTip_Closed"
-                                        Opened="ToolTip_Opened"
-                                        Style="{StaticResource ErrorRoundedTooltip}">
+            <ToolTip
+                x:Key="OutLineItemToolTip"
+                Width="320"
+                Height="120"
+                Closed="ToolTip_Closed"
+                Opened="ToolTip_Opened"
+                Style="{StaticResource ErrorRoundedTooltip}">
                 <customcontrol:CustomImageControl
-                                            Width="320"
-                                            Height="120"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch" />
+                    Width="320"
+                    Height="120"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch" />
             </ToolTip>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -79,13 +83,13 @@
             <Grid x:Name="Header">
                 <TextBlock
                     x:Name="TxtTitle"
-                    Text="{Binding T_Title}"
                     Margin="16,0,0,0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     FontFamily="Segoe UI"
                     FontSize="14"
-                    FontWeight="SemiBold"/>
+                    FontWeight="SemiBold"
+                    Text="{Binding T_Title}" />
                 <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                     <customcontrol:PathButton
                         x:Name="BtnAdd"
@@ -133,18 +137,18 @@
                                 </ContextMenu.ItemContainerStyle>
                                 <MenuItem
                                     Name="MenuExpandAll"
-                                    Header="{Binding T_Expand}"
                                     Command="{Binding ExpandAllCommand}"
-                                    CommandParameter="{Binding Outlinelist}" />
+                                    CommandParameter="{Binding Outlinelist}"
+                                    Header="{Binding T_Expand}" />
                                 <MenuItem
                                     Name="MenuCollapseAll"
-                                    Header="{Binding T_Collapse}"
                                     Command="{Binding CollapseAllCommand}"
-                                    CommandParameter="{Binding Outlinelist}"/>
+                                    CommandParameter="{Binding Outlinelist}"
+                                    Header="{Binding T_Collapse}" />
                                 <MenuItem
                                     Name="MenuDeleteAll"
-                                    Header="{Binding T_RemoveAll}"
-                                    Command="{Binding DeleteAllCommand}" />
+                                    Command="{Binding DeleteAllCommand}"
+                                    Header="{Binding T_RemoveAll}" />
                             </ContextMenu>
                         </customcontrol:PathButton.ContextMenu>
                     </customcontrol:PathButton>
@@ -192,14 +196,14 @@
                     HorizontalAlignment="Center"
                     FontFamily="Segoe UI"
                     FontSize="14"
-                    Text="No outline found" />
+                    Text="No Outlines" />
                 <TextBlock
                     Width="168"
                     HorizontalAlignment="Center"
                     FontFamily="Segoe UI"
                     FontSize="12"
                     Foreground="#94989C"
-                    Text="Please right-click on the selected page and select Add Outline, or click the Add button on the upper right to create a outline."
+                    Text="Please right-click on the selected page and select 'Add Outline', or click the 'Add' button on the upper right to create a outline."
                     TextWrapping="Wrap" />
             </StackPanel>
             <TreeView
@@ -211,8 +215,8 @@
                 Drop="OutlineView_Drop"
                 ItemsSource="{Binding Outlinelist}"
                 PreviewMouseDoubleClick="OutlineView_PreviewMouseDoubleClick"
-                PreviewMouseLeftButtonUp="OutlineView_PreviewMouseLeftButtonUp"
                 PreviewMouseDown="OutlineView_PreviewMouseDown"
+                PreviewMouseLeftButtonUp="OutlineView_PreviewMouseLeftButtonUp"
                 PreviewMouseMove="OutlineView_PreviewMouseMove"
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 VirtualizingPanel.ScrollUnit="Pixel"
@@ -270,18 +274,18 @@
                                     x:Name="ReName"
                                     HorizontalAlignment="Left"
                                     VerticalAlignment="Center"
-                                    TextWrapping="WrapWithOverflow"
                                     IsVisibleChanged="ReName_IsVisibleChanged"
                                     KeyDown="ReName_KeyDown"
-                                    Style="{StaticResource TextBoxStyleRadius}" />
+                                    Style="{StaticResource TextBoxStyleRadius}"
+                                    TextWrapping="WrapWithOverflow" />
                             </Grid>
                         </Grid>
                     </HierarchicalDataTemplate>
                 </TreeView.ItemTemplate>
                 <TreeView.ItemContainerStyle>
                     <Style BasedOn="{StaticResource OutLineItemStyle}" TargetType="TreeViewItem">
-                        <Setter Property="ContextMenu" Value="{StaticResource  OutLineItemMenu}" />
-                        <Setter Property="ToolTip" Value="{StaticResource  OutLineItemToolTip}" />
+                        <Setter Property="ContextMenu" Value="{StaticResource OutLineItemMenu}" />
+                        <Setter Property="ToolTip" Value="{StaticResource OutLineItemToolTip}" />
                         <EventSetter Event="PreviewMouseLeftButtonUp" Handler="TreeViewItem_PreviewMouseLeftButtonUp" />
                         <EventSetter Event="PreviewMouseLeftButtonDown" Handler="TreeViewItem_PreviewMouseLeftButtonDown" />
                     </Style>

+ 1 - 1
PDF Office/Views/TipContent/LinkAnnotTip.xaml

@@ -37,7 +37,7 @@
                 Padding="4,2,4,2"
                 FontSize="14"
                 Foreground="#252629"
-                Text="Please use the scroll bar, thumbnail tool to locate the target page, click or box the area to select the target range"
+                Text="To select a target page, you can turn to this page first, then click or box area on the page."
                 TextWrapping="Wrap" />
         </Grid>
     </Border>