소스 검색

模板-bug

liyijie 2 년 전
부모
커밋
1cb17e8f4f
16개의 변경된 파일181개의 추가작업 그리고 120개의 파일을 삭제
  1. 19 12
      PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundTemplateListColorContentViewModel.cs
  2. 16 13
      PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundTemplateListFileContentViewModel.cs
  3. 12 7
      PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesTemplateListContentViewModel.cs
  4. 12 7
      PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageHeaderFooter/HomePageHeaderFooterTemplateListContentViewModel.cs
  5. 10 6
      PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkTemplateListFileContentViewModel.cs
  6. 17 9
      PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkTemplateListTextContentViewModel.cs
  7. 1 1
      PDF Office/ViewModels/EditTools/Background/BackgroundContentViewModel.cs
  8. 18 12
      PDF Office/ViewModels/EditTools/Background/BackgroundTemplateListColorContentViewModel.cs
  9. 26 23
      PDF Office/ViewModels/EditTools/Background/BackgroundTemplateListFileContentViewModel.cs
  10. 1 1
      PDF Office/ViewModels/EditTools/Bates/BatesContentViewModel.cs
  11. 13 7
      PDF Office/ViewModels/EditTools/Bates/BatesTemplateListContentViewModel.cs
  12. 1 1
      PDF Office/ViewModels/EditTools/HeaderFooter/HeaderFooterContentViewModel.cs
  13. 11 7
      PDF Office/ViewModels/EditTools/HeaderFooter/HeaderFooterTemplateListContentViewModel.cs
  14. 1 1
      PDF Office/ViewModels/EditTools/Watermark/WatermarkContentViewModel.cs
  15. 10 6
      PDF Office/ViewModels/EditTools/Watermark/WatermarkTemplateListFileContentViewModel.cs
  16. 13 7
      PDF Office/ViewModels/EditTools/Watermark/WatermarkTemplateListTextContentViewModel.cs

+ 19 - 12
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundTemplateListColorContentViewModel.cs

@@ -1,4 +1,5 @@
 using ComPDFKit.PDFDocument;
+using Microsoft.Office.Interop.Word;
 using PDF_Office.EventAggregators;
 using PDF_Office.Helper;
 using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
@@ -169,22 +170,28 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.BackgroundTemplateList.Count != 0)
+            List<BackgroundItem> removebackgroundItems = new List<BackgroundItem>();
+            for (int i = 0; i < Settings.Default.BackgroundTemplateList.Count;i++)
             {
-                int temp = 0;
-                var template = Settings.Default.BackgroundTemplateList[temp];
-                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_IMAGE)
+                var template = Settings.Default.BackgroundTemplateList[i];
+                
+                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_COLOR)
                 {
-                    if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath) && File.Exists(BackgroundItem.previewImagePath))
-                    {
-                        Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
-                    }
+                    removebackgroundItems.Add(template);
+                    
+                }
+            }
+            foreach (var removetemplate in removebackgroundItems)
+            {
+                if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath) && File.Exists(BackgroundItem.previewImagePath))
+                {
+                    Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
+                }
 
-                    Settings.Default.BackgroundTemplateList.Remove(template);
-                    Settings.Default.Save();
+                Settings.Default.BackgroundTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
 
-                    BackgroundModColorCollection.Remove(template);
-                }
+                BackgroundModColorCollection.Remove(removetemplate);
             }
             GetBackgroundSource();
         }

+ 16 - 13
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBackground/HomePageBackgroundTemplateListFileContentViewModel.cs

@@ -175,26 +175,29 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.BackgroundTemplateList.Count != 0)
+            List<BackgroundItem> removebackgroundItems = new List<BackgroundItem>();
+            for (int i = 0; i < Settings.Default.BackgroundTemplateList.Count; i++)
             {
-                int temp = 0;
+                var template = Settings.Default.BackgroundTemplateList[i];
 
-                var template = Settings.Default.BackgroundTemplateList[temp];
-                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_COLOR)
+                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_IMAGE)
                 {
+                    removebackgroundItems.Add(template);
 
-                    if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath))
-                    {
-                        Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
-                    }
-
-                    Settings.Default.BackgroundTemplateList.Remove(template);
-                    Settings.Default.Save();
-
-                    BackgroundModFileCollection.Remove(template);
                 }
             }
+            foreach (var removetemplate in removebackgroundItems)
+            {
+                if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath) && File.Exists(BackgroundItem.previewImagePath))
+                {
+                    Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
+                }
+
+                Settings.Default.BackgroundTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
 
+                BackgroundModFileCollection.Remove(removetemplate);
+            }
             GetBackgroundSource();
         }
 

+ 12 - 7
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageBates/HomePageBatesTemplateListContentViewModel.cs

@@ -128,7 +128,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void DeleteTemplateItem(object e)
         {
-            var btn = e as System.Windows.Controls.Button;
+            var btn = e as System.Windows.Controls.Control;
             if (btn == null)
             {
                 return;
@@ -147,16 +147,21 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.BatesTemplateList.Count != 0)
+            List<BatesHeaderFooterItem> removebatesItems = new List<BatesHeaderFooterItem>();
+            for (int i = 0; i < Settings.Default.BatesTemplateList.Count; i++)
             {
-                int temp = 0;
-                var template = Settings.Default.BatesTemplateList[temp];
 
-                Settings.Default.BatesTemplateList.Remove(template);
-                Settings.Default.Save();
+                var template = Settings.Default.BatesTemplateList[i];
+                removebatesItems.Add(template);
+
 
-                BatesModCollection.Remove(template);
+            }
+            foreach (var removetemplate in removebatesItems)
+            {
+                Settings.Default.BatesTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
 
+                BatesModCollection.Remove(removetemplate);
             }
             GetBatesSource();
         }

+ 12 - 7
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageHeaderFooter/HomePageHeaderFooterTemplateListContentViewModel.cs

@@ -20,6 +20,7 @@ using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.
 using ComPDFKit.PDFDocument;
 using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
 using PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageWatermark;
+using Microsoft.Office.Interop.Word;
 
 namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageHeaderFooter
 {
@@ -127,7 +128,7 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void DeleteTemplateItem(object e)
         {
-            var btn = e as System.Windows.Controls.Button;
+            var btn = e as System.Windows.Controls.Control;
             if (btn == null)
             {
                 return;
@@ -146,16 +147,20 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.HeaderFooterTemplateList.Count != 0)
+            List<BatesHeaderFooterItem> removeheaderfooterItems = new List<BatesHeaderFooterItem>();
+            for (int i = 0; i < Settings.Default.HeaderFooterTemplateList.Count;i++)
             {
-                int temp = 0;
-                var template = Settings.Default.HeaderFooterTemplateList[temp];
+                var template = Settings.Default.HeaderFooterTemplateList[i];
+                removeheaderfooterItems.Add(template);
+                
 
-                Settings.Default.HeaderFooterTemplateList.Remove(template);
+            }
+            foreach (var removetemplate in removeheaderfooterItems)
+            {
+                Settings.Default.HeaderFooterTemplateList.Remove(removetemplate);
                 Settings.Default.Save();
 
-                HeaderFooterModCollection.Remove(template);
-
+                HeaderFooterModCollection.Remove(removetemplate);
             }
             GetHeaderFooterSource();
         }

+ 10 - 6
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkTemplateListFileContentViewModel.cs

@@ -160,17 +160,21 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.WatermarkTemplateList.Count != 0)
+            List<WatermarkItem> removewatermarkItems = new List<WatermarkItem>();
+            for (int i = 0; i < Settings.Default.WatermarkTemplateList.Count; i++)
             {
-                int temp = 0;
-                var template = Settings.Default.WatermarkTemplateList[temp];
+                var template = Settings.Default.WatermarkTemplateList[i];
                 if (template.type == ComPDFKit.PDFWatermark.C_Watermark_Type.WATERMARK_TYPE_IMG)
                 {
-                    Settings.Default.WatermarkTemplateList.Remove(template);
-                    Settings.Default.Save();
-                    WatermarkModFileCollection.Remove(template);
+                    removewatermarkItems.Add(template);
                 }
             }
+            foreach (var removetemplate in removewatermarkItems)
+            {
+                Settings.Default.WatermarkTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
+                WatermarkModFileCollection.Remove(removetemplate);
+            }
             GetWatermarkSource();
         }
 

+ 17 - 9
PDF Office/ViewModels/Dialog/HomePageToolsDialogs/HomePageBatchProcessing/HomePageWatermark/HomePageWatermarkTemplateListTextContentViewModel.cs

@@ -149,22 +149,29 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         }
 
+
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.WatermarkTemplateList.Count != 0)
+            List<WatermarkItem> removewatermarkItems = new List<WatermarkItem>();
+            for (int i = 0; i < Settings.Default.WatermarkTemplateList.Count; i++)
             {
-                int temp = 0;
-                var template = Settings.Default.WatermarkTemplateList[temp];
-                if (template.type == ComPDFKit.PDFWatermark.C_Watermark_Type.WATERMARK_TYPE_IMG)
+
+                var template = Settings.Default.WatermarkTemplateList[i];
+                if (template.type == ComPDFKit.PDFWatermark.C_Watermark_Type.WATERMARK_TYPE_TEXT)
                 {
-                    Settings.Default.WatermarkTemplateList.Remove(template);
-                    Settings.Default.Save();
-                    WatermarkModTextCollection.Remove(template);
+                    removewatermarkItems.Add(template);
                 }
             }
+            foreach (var removetemplate in removewatermarkItems)
+            {
+                Settings.Default.WatermarkTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
+                WatermarkModTextCollection.Remove(removetemplate);
+            }
             GetWatermarkSource();
         }
 
+
         public void RequestEditTemplateItem(object e)
         {
             var control = e as Control;
@@ -251,8 +258,9 @@ namespace PDF_Office.ViewModels.Dialog.HomePageToolsDialogs.HomePageBatchProcess
 
         public void SendTemplateItemToDocument(WatermarkItem WatermarkItem)
         {
-            if (WatermarkItem != null) {
-                homePageWatermarkDialogViewModel.CreateBtnIsEnabled=true;
+            if (WatermarkItem != null)
+            {
+                homePageWatermarkDialogViewModel.CreateBtnIsEnabled = true;
                 ConvertItemToInfo(WatermarkItem, ref WatermarkInfo);
                 homePageWatermarkDialogViewModel.WatermarkInfo = WatermarkInfo;
                 for (int i = 0; homePageWatermarkDialogViewModel.PDFDataTable.Rows.Count > i; i++)

+ 1 - 1
PDF Office/ViewModels/EditTools/Background/BackgroundContentViewModel.cs

@@ -235,7 +235,7 @@ namespace PDF_Office.ViewModels.EditTools.Background
             HomePageBatchProcessingDialogModel.FilePaths = new List<string> { PDFViewer.Document.FilePath.ToString() };
             HomePageBatchProcessingDialogModel.BatchProcessingIndex = 4;
             backgroundpdf.Add(ParameterNames.FilePath, new string[] { PDFViewer.Document.FilePath.ToString() });
-            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, backgroundpdf, e => { });
+            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, backgroundpdf, e => { EnterSelectedContent(TemplateListBaseName); });
         }
 
         public void EnterDocumentContent()

+ 18 - 12
PDF Office/ViewModels/EditTools/Background/BackgroundTemplateListColorContentViewModel.cs

@@ -172,23 +172,29 @@ namespace PDF_Office.ViewModels.EditTools.Background
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.BackgroundTemplateList.Count != 0)
+            List<BackgroundItem> removebackgroundItems = new List<BackgroundItem>();
+            for (int i = 0; i < Settings.Default.BackgroundTemplateList.Count; i++)
             {
-                int temp = 0;
-                var template = Settings.Default.BackgroundTemplateList[temp];
-                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_IMAGE)
-                {
-                    if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath) && File.Exists(BackgroundItem.previewImagePath))
-                    {
-                        Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
-                    }
+                var template = Settings.Default.BackgroundTemplateList[i];
 
-                    Settings.Default.BackgroundTemplateList.Remove(template);
-                    Settings.Default.Save();
+                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_COLOR)
+                {
+                    removebackgroundItems.Add(template);
 
-                    BackgroundModColorCollection.Remove(template);
                 }
             }
+            foreach (var removetemplate in removebackgroundItems)
+            {
+                if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath) && File.Exists(BackgroundItem.previewImagePath))
+                {
+                    Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
+                }
+
+                Settings.Default.BackgroundTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
+
+                BackgroundModColorCollection.Remove(removetemplate);
+            }
             GetBackgroundSource();
         }
 

+ 26 - 23
PDF Office/ViewModels/EditTools/Background/BackgroundTemplateListFileContentViewModel.cs

@@ -170,29 +170,32 @@ namespace PDF_Office.ViewModels.EditTools.Background
 
         }
 
-        public void DeleteAllTemplateItem()
-        {
-            while (Settings.Default.BackgroundTemplateList.Count != 0)
-            {
-                int temp = 0;
-
-                var template = Settings.Default.BackgroundTemplateList[temp];
-                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_COLOR)
-                {
-
-                    if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath))
-                    {
-                        Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
-                    }
-
-                    Settings.Default.BackgroundTemplateList.Remove(template);
-                    Settings.Default.Save();
-
-                    BackgroundModFileCollection.Remove(template);
-                }
-            }
-
-            GetBackgroundSource();
+        public void DeleteAllTemplateItem()
+        {
+            List<BackgroundItem> removebackgroundItems = new List<BackgroundItem>();
+            for (int i = 0; i < Settings.Default.BackgroundTemplateList.Count; i++)
+            {
+                var template = Settings.Default.BackgroundTemplateList[i];
+
+                if (template.type == ComPDFKit.PDFDocument.C_Background_Type.BG_TYPE_IMAGE)
+                {
+                    removebackgroundItems.Add(template);
+
+                }
+            }
+            foreach (var removetemplate in removebackgroundItems)
+            {
+                if (!string.IsNullOrEmpty(BackgroundItem.previewImagePath) && File.Exists(BackgroundItem.previewImagePath))
+                {
+                    Settings.Default.AppProperties.NeedToDeletePath.Add(BackgroundItem.previewImagePath);
+                }
+
+                Settings.Default.BackgroundTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
+
+                BackgroundModFileCollection.Remove(removetemplate);
+            }
+            GetBackgroundSource();
         }
 
         public void ConvertItemToInfo(BackgroundItem backgroundItem, ref BackgroundInfo backgroundInfo)

+ 1 - 1
PDF Office/ViewModels/EditTools/Bates/BatesContentViewModel.cs

@@ -137,7 +137,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
             HomePageBatchProcessingDialogModel.FilePaths = new List<string> { PDFViewer.Document.FilePath.ToString() };
             HomePageBatchProcessingDialogModel.BatchProcessingIndex = 6;
             bates.Add(ParameterNames.FilePath, new string[] { PDFViewer.Document.FilePath.ToString() });
-            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, bates, e => { });
+            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, bates, e => { EnterSelectedContent(TemplateListName); });
         }
 
         public void EnterSelectedContent(string SelectedContentName)

+ 13 - 7
PDF Office/ViewModels/EditTools/Bates/BatesTemplateListContentViewModel.cs

@@ -1,4 +1,5 @@
 using ComPDFKitViewer.PdfViewer;
+using Microsoft.Office.Interop.Word;
 using PDF_Office.EventAggregators;
 using PDF_Office.Helper;
 using PDF_Office.Model;
@@ -126,7 +127,7 @@ namespace PDF_Office.ViewModels.EditTools.Bates
 
         public void DeleteTemplateItem(object e)
         {
-            var btn = e as System.Windows.Controls.Button;
+            var btn = e as System.Windows.Controls.Control;
             if (btn == null)
             {
                 return;
@@ -145,16 +146,21 @@ namespace PDF_Office.ViewModels.EditTools.Bates
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.BatesTemplateList.Count != 0)
+            List<BatesHeaderFooterItem> removebatesItems = new List<BatesHeaderFooterItem>();
+            for (int i = 0; i < Settings.Default.BatesTemplateList.Count;i++)
             {
-                int temp = 0;
-                var template = Settings.Default.BatesTemplateList[temp];
+         
+                var template = Settings.Default.BatesTemplateList[i];
+                removebatesItems.Add(template);
+                
 
-                Settings.Default.BatesTemplateList.Remove(template);
+            }
+            foreach (var removetemplate in removebatesItems)
+            {
+                Settings.Default.BatesTemplateList.Remove(removetemplate);
                 Settings.Default.Save();
 
-                BatesModCollection.Remove(template);
-
+                BatesModCollection.Remove(removetemplate);
             }
             GetBatesSource();
         }

+ 1 - 1
PDF Office/ViewModels/EditTools/HeaderFooter/HeaderFooterContentViewModel.cs

@@ -138,7 +138,7 @@ namespace PDF_Office.ViewModels.EditTools.HeaderFooter
             HomePageBatchProcessingDialogModel.FilePaths = new List<string> { PDFViewer.Document.FilePath.ToString() };
             HomePageBatchProcessingDialogModel.BatchProcessingIndex = 5;
             headerFooterpdf.Add(ParameterNames.FilePath, new string[] { PDFViewer.Document.FilePath.ToString() });
-            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, headerFooterpdf, e => { });
+            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, headerFooterpdf, e => { EnterSelectedContent(TemplateListName); });
         }
 
         public void EnterSelectedContent(string SelectedContentName)

+ 11 - 7
PDF Office/ViewModels/EditTools/HeaderFooter/HeaderFooterTemplateListContentViewModel.cs

@@ -123,7 +123,7 @@ namespace PDF_Office.ViewModels.EditTools.HeaderFooter
 
         public void DeleteTemplateItem(object e)
         {
-            var btn = e as System.Windows.Controls.Button;
+            var btn = e as System.Windows.Controls.Control;
             if (btn == null)
             {
                 return;
@@ -142,16 +142,20 @@ namespace PDF_Office.ViewModels.EditTools.HeaderFooter
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.HeaderFooterTemplateList.Count != 0)
+            List<BatesHeaderFooterItem> removeheaderfooterItems = new List<BatesHeaderFooterItem>();
+            for (int i = 0; i < Settings.Default.HeaderFooterTemplateList.Count; i++)
             {
-                int temp = 0;
-                var template = Settings.Default.HeaderFooterTemplateList[temp];
+                var template = Settings.Default.HeaderFooterTemplateList[i];
+                removeheaderfooterItems.Add(template);
 
-                Settings.Default.HeaderFooterTemplateList.Remove(template);
-                Settings.Default.Save();
 
-                HeaderFooterModCollection.Remove(template);
+            }
+            foreach (var removetemplate in removeheaderfooterItems)
+            {
+                Settings.Default.HeaderFooterTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
 
+                HeaderFooterModCollection.Remove(removetemplate);
             }
             GetHeaderFooterSource();
         }

+ 1 - 1
PDF Office/ViewModels/EditTools/Watermark/WatermarkContentViewModel.cs

@@ -246,7 +246,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             HomePageBatchProcessingDialogModel.FilePaths = new List<string> { PDFViewer.Document.FilePath.ToString() };
             HomePageBatchProcessingDialogModel.BatchProcessingIndex = 3;
             watermarkpdf.Add(ParameterNames.FilePath, new string[] { PDFViewer.Document.FilePath.ToString() });
-            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, watermarkpdf, e => { });
+            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, watermarkpdf, e => { EnterSelectedContent(TemplateListName); });
         }
 
         public void OnNavigatedTo(NavigationContext navigationContext)

+ 10 - 6
PDF Office/ViewModels/EditTools/Watermark/WatermarkTemplateListFileContentViewModel.cs

@@ -167,17 +167,21 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.WatermarkTemplateList.Count != 0)
+            List<WatermarkItem> removewatermarkItems = new List<WatermarkItem>();
+            for (int i = 0; i < Settings.Default.WatermarkTemplateList.Count; i++)
             {
-                int temp = 0;
-                var template = Settings.Default.WatermarkTemplateList[temp];
+                var template = Settings.Default.WatermarkTemplateList[i];
                 if (template.type == ComPDFKit.PDFWatermark.C_Watermark_Type.WATERMARK_TYPE_IMG)
                 {
-                    Settings.Default.WatermarkTemplateList.Remove(template);
-                    Settings.Default.Save();
-                    WatermarkModFileCollection.Remove(template);
+                    removewatermarkItems.Add(template);
                 }
             }
+            foreach (var removetemplate in removewatermarkItems)
+            {
+                Settings.Default.WatermarkTemplateList.Remove(removetemplate);
+                Settings.Default.Save();
+                WatermarkModFileCollection.Remove(removetemplate);
+            }
             GetWatermarkSource();
         }
 

+ 13 - 7
PDF Office/ViewModels/EditTools/Watermark/WatermarkTemplateListTextContentViewModel.cs

@@ -18,6 +18,7 @@ using PDF_Office.Model;
 using PDF_Office.Helper;
 using PDF_Office.Model.EditTools.Background;
 using PDF_Office.ViewModels.Tools;
+using Microsoft.Office.Interop.Word;
 
 namespace PDF_Office.ViewModels.EditTools.Watermark
 {
@@ -149,17 +150,22 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
 
         public void DeleteAllTemplateItem()
         {
-            while (Settings.Default.WatermarkTemplateList.Count != 0)
+            List<WatermarkItem> removewatermarkItems=new List<WatermarkItem>();
+            for (int i=0; i<Settings.Default.WatermarkTemplateList.Count;i++)
             {
-                int temp = 0;
-                var template = Settings.Default.WatermarkTemplateList[temp];
-                if (template.type == ComPDFKit.PDFWatermark.C_Watermark_Type.WATERMARK_TYPE_IMG)
+               
+                var template = Settings.Default.WatermarkTemplateList[i];
+                if (template.type == ComPDFKit.PDFWatermark.C_Watermark_Type.WATERMARK_TYPE_TEXT)
                 {
-                    Settings.Default.WatermarkTemplateList.Remove(template);
-                    Settings.Default.Save();
-                    WatermarkModTextCollection.Remove(template);
+                    removewatermarkItems.Add(template);
                 }
             }
+            foreach (var removetemplate in removewatermarkItems)
+            {
+                Settings.Default.WatermarkTemplateList.Remove(removetemplate);
+                Settings.Default.Save(); 
+                WatermarkModTextCollection.Remove(removetemplate); 
+            }
             GetWatermarkSource();
         }