Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/Helper/ConverterHelper.cs

@@ -14,6 +14,8 @@ using Exception = System.Exception;
 using ImageMagick;
 using System.IO.Compression;
 using System.Windows;
+using System.Net.Mime;
+using System.Windows.Controls;
 
 namespace PDF_Master.Helper
 {
@@ -419,43 +421,69 @@ namespace PDF_Master.Helper
             }
             return result;
         }
-
-        public static void Clear()
+        public static void Clear(string ConvertType)
         {
-            if (wordConverter != null)
-            {
-                wordConverter.Cancel();
-                return;
-            }
-            if (excelConverter != null)
-            {
-                excelConverter.Cancel();
-                return;
-            }
-            if (pptConverter != null)
-            {
-                pptConverter.Cancel();
-                return;
-            }
-            if (txtConverter != null)
-            {
-                txtConverter.Cancel();
-                return;
-            }
-            if (csvConverter != null)
-            {
-                csvConverter.Cancel();
-                return;
-            }
-            if (rtfConverter != null)
-            {
-                rtfConverter.Cancel();
-                return;
-            }
-            if (htmlConverter != null)
+
+            switch (ConvertType)
             {
-                htmlConverter.Cancel();
-                return;
+                case "Word":
+                    if (wordConverter != null)
+                    {
+                        wordConverter.Cancel();
+                    }
+                    break;
+
+                case "Excel":
+                    if (excelConverter != null)
+                    {
+                        excelConverter.Cancel();
+                    }
+                    break;
+
+                case "PPT":
+                    if (pptConverter != null)
+                    {
+                        pptConverter.Cancel();
+                    }
+                    break;
+
+                case "Text":
+                    if (txtConverter != null)
+                    {
+                        txtConverter.Cancel();
+                    }
+                    break;
+
+                case "CSV":
+                    if (csvConverter != null)
+                    {
+                        csvConverter.Cancel();
+                    }
+                    break;
+
+                case "RTF":
+                    if (rtfConverter != null)
+                    {
+                        rtfConverter.Cancel();
+                    }
+                    break;
+
+                case "HTML":
+                    if (htmlConverter != null)
+                    {
+                        htmlConverter.Cancel();
+                    }
+                    break;
+
+                case "Img":
+                    if (imgConverter != null)
+                    {
+                        imgConverter?.Cancel();
+                    }
+                    break;
+
+                default:
+                    break;
             }
         }
         private static void StartFile(string path)

PDF Office/Model/Dialog/ConverterDialogs/ConverterDialogsModel.cs

@@ -9,6 +9,7 @@ using ComPDFKit_Conversion.Options;
 using Microsoft.Office.Interop.Word;
 using PDF_Master.Helper;
 using PDF_Master.CustomControl;
+using System.Net.Mime;
 
 namespace PDF_Master.Model.Dialog.ConverterDialogs
 {
@@ -67,6 +68,11 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
         /// </summary>
         public bool IsCustomFileName = true;
 
+        /// <summary>
+        /// 文档密码;
+        /// </summary>
+        public string ConvertType = "";
+
 
         /// <summary>
         /// OCR,与部分功能;
@@ -75,8 +81,12 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
 
         private void ConverterClear()
         {
-            ConverterHelper.Clear();
-            App.mainWindowViewModel.IsProcessVisible = System.Windows.Visibility.Collapsed;
+            ConverterHelper.Clear(ConvertType);
+            App.mainWindowViewModel.ProcessCloseBtnVisible = System.Windows.Visibility.Collapsed;
+            App.mainWindowViewModel.ProgressTitle = "Connceling";
+            App.mainWindowViewModel.Value = App.mainWindowViewModel.MaxValue / 3;
+            //App.mainWindowViewModel.ProgressTitle = "";
+            //App.mainWindowViewModel.IsProcessVisible = System.Windows.Visibility.Collapsed;
         }
         private void SetProgress(int pageIndex)
         {
@@ -94,6 +104,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
             GetProgress += SetProgress;
             App.mainWindowViewModel.ProcessCloseAction = ConverterClear;
             convertType = e.Parameters.GetValue<string>(ParameterNames.ConverterType).ToString();
+            ConvertType = convertType;
             App.mainWindowViewModel.ProgressTitle = "Converting";
             App.mainWindowViewModel.Value = 0;
             App.mainWindowViewModel.IsProcessVisible = System.Windows.Visibility.Visible;
@@ -168,7 +179,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
                     else { App.mainWindowViewModel.IsProcessVisible = System.Windows.Visibility.Collapsed; }
                     break;
                 case "RTF":
-                    App.mainWindowViewModel.ProcessCloseBtnVisible = System.Windows.Visibility.Collapsed;
+                    //App.mainWindowViewModel.ProcessCloseBtnVisible = System.Windows.Visibility.Collapsed;
                     ConverterRTFDialogModel ConverterRTFModel = e.Parameters.GetValue<ConverterRTFDialogModel>(ParameterNames.ConverterTypeModel);
                     if (ConverterRTFModel != null)
                     {

PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterProgressBarDialogViewModel.cs

@@ -80,7 +80,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
         public void OnDialogClosed()
         {
-            ConverterHelper.Clear();
+            //ConverterHelper.Clear();
 
         }
 

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageConverter/HomePageConverterDialogViewModel.cs

@@ -760,7 +760,7 @@ namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void OnNavigatedFrom(NavigationContext navigationContext)
         {
-            ConverterHelper.Clear();
+            //ConverterHelper.Clear();
         }
         #endregion
     }

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -373,7 +373,7 @@ namespace PDF_Master.ViewModels.Tools
                         PropertyPanel.annotlists = e.AnnotItemsList;
                     }
                     //0515 调整单击 便签弹窗
-                    if (e.AnnotItemsList.Count == 1 && e.IsMouseRightActive==false)
+                    if (e.AnnotItemsList.Count == 1 && e.IsMouseRightActive == false)
                     {
                         if (e.AnnotItemsList[0] is StickyAnnotArgs stickyAnnotArgs)
                         {
@@ -791,7 +791,22 @@ namespace PDF_Master.ViewModels.Tools
                             else
                             {
                                 GetSelectedAnnots(e);
-                                ShowPropertyPanel(true);
+                                if (string.IsNullOrEmpty(StrAnnotToolChecked) == true)
+                                {
+                                    var count = e.AnnotItemsList.FindAll(r => r.EventType == AnnotArgsType.AnnotStamp).Count;
+                                    if (count > 0)
+                                    {
+                                        ShowPropertyPanel(false);
+                                    }
+                                    else
+                                    {
+                                        ShowPropertyPanel(true);
+                                    }
+                                }
+                                else
+                                {
+                                    ShowPropertyPanel(true);
+                                }
                             }
                         }
                     }

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -2007,7 +2007,6 @@ namespace PDF_Master.ViewModels.Tools
                                 case AnnotArgsType.AnnotLine:
                                 case AnnotArgsType.AnnotSquare:
                                 case AnnotArgsType.AnnotCircle:
-
                                     //case AnnotArgsType.AnnotSticky:
                                     Trace.WriteLine(StrAnnotToolChecked);
 
@@ -2056,8 +2055,13 @@ namespace PDF_Master.ViewModels.Tools
                                     break;
 
                                 case AnnotArgsType.AnnotLink:
-                                    ExitAnnotationTool();
+                                    //ExitAnnotationTool();
+                                    if (PDFViewer.ToolManager.HasTool)
+                                    {
+                                        PDFViewer.RemoveTool(false);
+                                    }
 
+                                    ExitAnnotationTool();
                                     events.GetEvent<LinkAnnotTipCloseEvent>().Publish(new LinkAnnotTipCloseArgs() { UniCode = App.mainWindowViewModel.SelectedItem.Unicode });
                                     break;
                             }