ソースを参照

综合-修复文案问题,修复页面编辑比较表弹窗显示后,虚影无法显示问题

ZhouJieSheng 1 年間 前
コミット
7c18fe9f0e

+ 2 - 2
PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -631,8 +631,8 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</tar
           <target state="new">Expand All</target>
         </trans-unit>
         <trans-unit id="Annotation_MenuExport" translate="yes" xml:space="preserve">
-          <source>Export Annotations to XFDX</source>
-          <target state="new">Export Annotations to XFDX</target>
+          <source>Export Annotations to XFDF</source>
+          <target state="new">Export Annotations to XFDF</target>
           <note from="MultilingualBuild" annotates="source" priority="2">导出XFDF</note>
         </trans-unit>
         <trans-unit id="Annotation_MenuImport" translate="yes" xml:space="preserve">

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

@@ -631,8 +631,8 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</tar
           <target state="new">Expand All</target>
         </trans-unit>
         <trans-unit id="Annotation_MenuExport" translate="yes" xml:space="preserve">
-          <source>Export Annotations to XFDX</source>
-          <target state="new">Export Annotations to XFDX</target>
+          <source>Export Annotations to XFDF</source>
+          <target state="new">Export Annotations to XFDF</target>
           <note from="MultilingualBuild" annotates="source" priority="2">导出XFDF</note>
         </trans-unit>
         <trans-unit id="Annotation_MenuImport" translate="yes" xml:space="preserve">

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

@@ -631,8 +631,8 @@ View, Annotate and Convert PDFs with PDF Master to boost your productivity.</tar
           <target state="new">Expand All</target>
         </trans-unit>
         <trans-unit id="Annotation_MenuExport" translate="yes" xml:space="preserve">
-          <source>Export Annotations to XFDX</source>
-          <target state="new">Export Annotations to XFDX</target>
+          <source>Export Annotations to XFDF</source>
+          <target state="new">Export Annotations to XFDF</target>
           <note from="MultilingualBuild" annotates="source" priority="2">导出XFDF</note>
         </trans-unit>
         <trans-unit id="Annotation_MenuImport" translate="yes" xml:space="preserve">

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

@@ -241,7 +241,7 @@ namespace PDF_Master.Strings.MainPage {
         }
         
         /// <summary>
-        ///   查找类似 Export Annotations to XFDX 的本地化字符串。
+        ///   查找类似 Export Annotations to XFDF 的本地化字符串。
         /// </summary>
         public static string Annotation_MenuExport {
             get {

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

@@ -172,7 +172,7 @@
     <value>Expand All</value>
   </data>
   <data name="Annotation_MenuExport" xml:space="preserve">
-    <value>Export Annotations to XFDX</value>
+    <value>Export Annotations to XFDF</value>
     <comment>导出XFDF</comment>
   </data>
   <data name="Annotation_MenuImport" xml:space="preserve">

+ 1 - 1
PDF Office/Views/Dialog/ServiceDialog/UserOutingLogin.xaml.cs

@@ -29,7 +29,7 @@ namespace PDF_Master.Views.Dialog.ServiceDialog
         private void Hyperlink_Click(object sender, RoutedEventArgs e)
         {
             StringBuilder sr = new StringBuilder();
-            sr.AppendFormat("{0} - {1};{2}", App.Name+"Windows", App.Version, "Questions About Account Cancellation");
+            sr.AppendFormat("{0} - {1};{2}", App.Name+" Windows", App.Version, "Questions About Account Cancellation");
 
             System.Diagnostics.Process.Start(string.Format("mailto:support@pdfreaderpro.com?subject={0}", sr));
             //Process.Start(new ProcessStartInfo("https://www.pdfreaderpro.com/zh-cn/contact"));

+ 6 - 6
PDF Office/Views/PageEdit/PageEditContent.xaml.cs

@@ -580,10 +580,6 @@ namespace PDF_Master.Views.PageEdit
                 return;
             }
             #region 功能付费锁
-            if((bool)!viewModel?.viewContentViewModel.IAPBeforeFunction())
-            {
-                return;
-            }
             #endregion
 
             #region  从外部拖拽插入文件
@@ -694,6 +690,12 @@ namespace PDF_Master.Views.PageEdit
         {
             try
             {
+                //将付费锁逻辑提前,避免因弹窗显示后导致虚影无法消失问题
+                if(!viewModel.viewContentViewModel.IAPBeforeFunction())
+                {
+                    return;
+                }
+
                 //ctrl建按下 不显示插入标记和虚影  因为释放不会响应drop事件
                 if (e.KeyStates == (DragDropKeyStates.ControlKey | DragDropKeyStates.LeftMouseButton) || e.KeyStates == (DragDropKeyStates.ShiftKey | DragDropKeyStates.LeftMouseButton | DragDropKeyStates.ControlKey))
                     return;
@@ -1066,7 +1068,5 @@ namespace PDF_Master.Views.PageEdit
                 timer.Tick += Timer_Tick;
             }
         }
-
-       
     }
 }