首页-合并允许多选文件、调整注释参考线

PDF Office/MultilingualResources/PDF Office.en.xlf

@@ -410,8 +410,8 @@
           <note from="MultilingualBuild" annotates="source" priority="2">支持的html格式</note>
         </trans-unit>
         <trans-unit id="imageex" translate="yes" xml:space="preserve">
-          <source>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</source>
-          <target state="new">*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</target>
+          <source>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</source>
+          <target state="new">*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</target>
         </trans-unit>
         <trans-unit id="OpenDialogFilter" translate="yes" xml:space="preserve">
           <source>PDF Files (*.pdf)|*.pdf</source>

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

@@ -410,8 +410,8 @@
           <note from="MultilingualBuild" annotates="source" priority="2">支持的html格式</note>
         </trans-unit>
         <trans-unit id="imageex" translate="yes" xml:space="preserve">
-          <source>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</source>
-          <target state="new">*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</target>
+          <source>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</source>
+          <target state="new">*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</target>
         </trans-unit>
         <trans-unit id="OpenDialogFilter" translate="yes" xml:space="preserve">
           <source>PDF Files (*.pdf)|*.pdf</source>

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

@@ -410,8 +410,8 @@
           <note from="MultilingualBuild" annotates="source" priority="2">支持的html格式</note>
         </trans-unit>
         <trans-unit id="imageex" translate="yes" xml:space="preserve">
-          <source>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</source>
-          <target state="new">*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</target>
+          <source>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</source>
+          <target state="new">*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</target>
         </trans-unit>
         <trans-unit id="OpenDialogFilter" translate="yes" xml:space="preserve">
           <source>PDF Files (*.pdf)|*.pdf</source>

PDF Office/Properties/Resources.Designer.cs

@@ -79,7 +79,7 @@ namespace PDF_Master.Properties {
         }
         
         /// <summary>
-        ///   查找类似 *.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi; 的本地化字符串。
+        ///   查找类似 *.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi; 的本地化字符串。
         /// </summary>
         internal static string imageex {
             get {

PDF Office/Properties/Resources.resx

@@ -126,7 +126,7 @@
     <comment>支持的html格式</comment>
   </data>
   <data name="imageex" xml:space="preserve">
-    <value>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.icns;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</value>
+    <value>*.jpg;*.cur;*.bmp;*.jpeg;*.gif;*.png;*.tiff;*.tif;*.pic;*.ico;*.tga;*.psd;*.eps;*.hdr;*.jp2;*.jpc;*.pict;*.sgi;</value>
   </data>
   <data name="OpenDialogFilter" xml:space="preserve">
     <value>PDF Files (*.pdf)|*.pdf</value>

PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs

@@ -123,17 +123,18 @@ namespace PDF_Master.ViewModels.HomePanel.PDFTools
             System.Windows.Forms.OpenFileDialog dlg = new System.Windows.Forms.OpenFileDialog();
             dlg.Multiselect = false;
             dlg.Filter = "PDF|*.pdf;*.PDF;";
-            if (toolItem.FnType == PDFFnType.Compress || toolItem.FnType == PDFFnType.Security||
-                toolItem.FnType ==PDFFnType.BatchRemove||toolItem.FnType==PDFFnType.ConvertPDF||
-                toolItem.FnType==PDFFnType.Background|| toolItem.FnType == PDFFnType.HeaderFooter|| 
-                toolItem.FnType == PDFFnType.BatesNumbers|| toolItem.FnType == PDFFnType.WaterMark|| 
-                toolItem.FnType == PDFFnType.PDFToExcel|| toolItem.FnType == PDFFnType.PDFToImage||
-                toolItem.FnType == PDFFnType.PDFToPPT|| toolItem.FnType == PDFFnType.Batch ||
-                toolItem.FnType == PDFFnType.Merge)
-            {
-                //dlg.Multiselect = true;
-            }
-            if (toolItem.FnType == PDFFnType.ImageToPDF)
+            //MVP原规划的批量工具  暂时先注释掉
+            //if (toolItem.FnType == PDFFnType.Compress || toolItem.FnType == PDFFnType.Security||
+            //    toolItem.FnType ==PDFFnType.BatchRemove||toolItem.FnType==PDFFnType.ConvertPDF||
+            //    toolItem.FnType==PDFFnType.Background|| toolItem.FnType == PDFFnType.HeaderFooter|| 
+            //    toolItem.FnType == PDFFnType.BatesNumbers|| toolItem.FnType == PDFFnType.WaterMark|| 
+            //    toolItem.FnType == PDFFnType.PDFToExcel|| toolItem.FnType == PDFFnType.PDFToImage||
+            //    toolItem.FnType == PDFFnType.PDFToPPT|| toolItem.FnType == PDFFnType.Batch ||
+            //    toolItem.FnType == PDFFnType.Merge)
+            //{
+            //    //dlg.Multiselect = true;
+            //}
+            if (toolItem.FnType == PDFFnType.ImageToPDF|| toolItem.FnType == PDFFnType.Merge)
             {
                 dlg.Multiselect = true;
                 dlg.Filter = "Picture|*.png;*.PNG;*.jpg;*.JPG;*bmp;*jpeg;*gif;*tiff;";

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -2262,7 +2262,8 @@ namespace PDF_Master.ViewModels
             PDFViewer.Load();
             PDFViewer.SetFormFieldHighlight(Settings.Default.AppProperties.InitialVIew.HighlightLink);
             PDFViewer.SetBackgroundBrush(new System.Windows.Media.SolidColorBrush(Settings.Default.AppProperties.InitialVIew.BackGround));
-
+            //设置移动注释参考线
+            ComPDFKitViewer.CommonDrawData.MovePen = new System.Windows.Media.Pen((System.Windows.Media.Brush)new BrushConverter().ConvertFromString("#1770F4"),1);
             //还原上一次关闭前的视图设置
             GetOpenFileInfo();