Browse Source

其他-更改产品名、命名空间为PDF Master

ZhouJieSheng 2 years ago
parent
commit
15bbeced45
100 changed files with 224 additions and 223 deletions
  1. 3 3
      PDF Office/App.config
  2. 23 23
      PDF Office/App.xaml
  3. 55 54
      PDF Office/App.xaml.cs
  4. 2 2
      PDF Office/CustomControl/AlertsMessage.xaml
  5. 1 1
      PDF Office/CustomControl/AlertsMessage.xaml.cs
  6. 2 2
      PDF Office/CustomControl/BatchStatus.xaml
  7. 1 1
      PDF Office/CustomControl/BatchStatus.xaml.cs
  8. 2 2
      PDF Office/CustomControl/ColorDropBox.xaml
  9. 2 2
      PDF Office/CustomControl/ColorDropBox.xaml.cs
  10. 3 3
      PDF Office/CustomControl/ColorDropBoxPop.xaml
  11. 1 1
      PDF Office/CustomControl/ColorDropBoxPop.xaml.cs
  12. 2 2
      PDF Office/CustomControl/CommonWritableComboBox.xaml
  13. 1 1
      PDF Office/CustomControl/CommonWritableComboBox.xaml.cs
  14. 5 5
      PDF Office/CustomControl/CompositeControl/ColorContent.xaml
  15. 3 3
      PDF Office/CustomControl/CompositeControl/ColorContent.xaml.cs
  16. 3 3
      PDF Office/CustomControl/CompositeControl/ColorMenuItem.xaml
  17. 1 1
      PDF Office/CustomControl/CompositeControl/ColorMenuItem.xaml.cs
  18. 3 3
      PDF Office/CustomControl/CompositeControl/ColorSubContent.xaml
  19. 1 1
      PDF Office/CustomControl/CompositeControl/ColorSubContent.xaml.cs
  20. 2 2
      PDF Office/CustomControl/CompositeControl/CustomComboControl.xaml
  21. 1 1
      PDF Office/CustomControl/CompositeControl/CustomComboControl.xaml.cs
  22. 2 2
      PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml
  23. 1 1
      PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml.cs
  24. 3 3
      PDF Office/CustomControl/CompositeControl/SlidContent.xaml
  25. 2 2
      PDF Office/CustomControl/CompositeControl/SlidContent.xaml.cs
  26. 3 3
      PDF Office/CustomControl/CompositeControl/SlidContentPop.xaml
  27. 1 1
      PDF Office/CustomControl/CompositeControl/SlidContentPop.xaml.cs
  28. 1 1
      PDF Office/CustomControl/CustomIconToggleBtn.cs
  29. 1 1
      PDF Office/CustomControl/CustomImageControl.cs
  30. 1 1
      PDF Office/CustomControl/DialogContent.cs
  31. 2 2
      PDF Office/CustomControl/Form/FormFieldCombox.xaml
  32. 2 2
      PDF Office/CustomControl/Form/FormFieldCombox.xaml.cs
  33. 3 3
      PDF Office/CustomControl/Form/LayoutAglinContent.xaml
  34. 1 1
      PDF Office/CustomControl/Form/LayoutAglinContent.xaml.cs
  35. 1 1
      PDF Office/CustomControl/IconAndTextTabItem.cs
  36. 1 1
      PDF Office/CustomControl/ImageButton.cs
  37. 1 1
      PDF Office/CustomControl/ImageRadioButton .cs
  38. 1 1
      PDF Office/CustomControl/ListBoxItemToolBar.cs
  39. 2 2
      PDF Office/CustomControl/LoadingControl.xaml
  40. 1 1
      PDF Office/CustomControl/LoadingControl.xaml.cs
  41. 1 1
      PDF Office/CustomControl/MenuItemWithPath.cs
  42. 1 1
      PDF Office/CustomControl/MessageBoxEx.cs
  43. 2 2
      PDF Office/CustomControl/NumericUpDown.xaml
  44. 1 1
      PDF Office/CustomControl/NumericUpDown.xaml.cs
  45. 2 2
      PDF Office/CustomControl/PageControl.xaml
  46. 1 1
      PDF Office/CustomControl/PageControl.xaml.cs
  47. 2 2
      PDF Office/CustomControl/PageTurningPreview.xaml
  48. 2 2
      PDF Office/CustomControl/PageTurningPreview.xaml.cs
  49. 3 3
      PDF Office/CustomControl/PaginationControl.xaml
  50. 1 1
      PDF Office/CustomControl/PaginationControl.xaml.cs
  51. 1 1
      PDF Office/CustomControl/PathButton.cs
  52. 1 1
      PDF Office/CustomControl/PathRadioButton.cs
  53. 1 1
      PDF Office/CustomControl/ScanViewControl/CustomDraw.cs
  54. 2 2
      PDF Office/CustomControl/ScanViewControl/CustomPanel.cs
  55. 1 1
      PDF Office/CustomControl/ScanViewControl/DrawRect.cs
  56. 1 1
      PDF Office/CustomControl/SystemControl/CustomCommandAction .cs
  57. 2 2
      PDF Office/CustomControl/SystemControl/InterTabClient.cs
  58. 1 1
      PDF Office/CustomControl/SystemControl/RoutedEventTrigger.cs
  59. 3 3
      PDF Office/CustomControl/SystemControl/TabablzRegionBehavior.cs
  60. 1 1
      PDF Office/CustomControl/TextBoxEx.cs
  61. 2 2
      PDF Office/CustomControl/TextBoxWithTip.xaml
  62. 1 1
      PDF Office/CustomControl/TextBoxWithTip.xaml.cs
  63. 2 2
      PDF Office/CustomControl/ToastControl.xaml
  64. 1 1
      PDF Office/CustomControl/ToastControl.xaml.cs
  65. 2 2
      PDF Office/CustomControl/WritableComboBox.xaml
  66. 2 2
      PDF Office/CustomControl/WritableComboBox.xaml.cs
  67. 1 1
      PDF Office/DataConvert/AnnotateFontSizeConverter.cs
  68. 1 1
      PDF Office/DataConvert/BoolToBrushConvert.cs
  69. 1 1
      PDF Office/DataConvert/BoolToTextWrapConvert.cs
  70. 1 1
      PDF Office/DataConvert/BoolToVisible.cs
  71. 1 1
      PDF Office/DataConvert/CenterToolTipConverter .cs
  72. 1 1
      PDF Office/DataConvert/ColorBrushConvert.cs
  73. 1 1
      PDF Office/DataConvert/CreateTimeToDate.cs
  74. 1 1
      PDF Office/DataConvert/FileFormatToIconConvert.cs
  75. 1 1
      PDF Office/DataConvert/FileToImageSourceConvert.cs
  76. 1 1
      PDF Office/DataConvert/GroupHeaderConverter.cs
  77. 1 1
      PDF Office/DataConvert/IndexConverter .cs
  78. 1 1
      PDF Office/DataConvert/IntAndTagToBoolMultiBinding.cs
  79. 1 1
      PDF Office/DataConvert/IntToBooleanConvert.cs
  80. 1 1
      PDF Office/DataConvert/IntToColorBrush.cs
  81. 1 1
      PDF Office/DataConvert/InvertBoolConvert.cs
  82. 1 1
      PDF Office/DataConvert/ListCountToVisible.cs.cs
  83. 1 1
      PDF Office/DataConvert/ObjectConvert.cs
  84. 1 1
      PDF Office/DataConvert/PropertyPanelVisible.cs
  85. 1 1
      PDF Office/DataConvert/SignatureButtonConvert.cs
  86. 1 1
      PDF Office/DataConvert/StringToDateConvert.cs
  87. 1 1
      PDF Office/DataConvert/StringToVisibleConvert.cs
  88. 1 1
      PDF Office/DataConvert/TextAlignToCheckedConverter.cs
  89. 1 1
      PDF Office/DataConvert/UnVisivleConvert.cs
  90. 1 1
      PDF Office/DataConvert/VisibleToBoolConvert.cs
  91. 1 1
      PDF Office/DataConvert/WidthConvert.cs
  92. 1 1
      PDF Office/EventAggregators/CleanSelectAllEvent.cs
  93. 1 1
      PDF Office/EventAggregators/DragablzWindowEvent.cs
  94. 5 5
      PDF Office/EventAggregators/EditToolsEvent.cs
  95. 1 1
      PDF Office/EventAggregators/FillAndSignEvent.cs
  96. 1 1
      PDF Office/EventAggregators/OpenFileEvent.cs
  97. 1 1
      PDF Office/EventAggregators/PageEditNotifyEvent.cs
  98. 1 1
      PDF Office/EventAggregators/PageEditRefreshEvent.cs
  99. 1 1
      PDF Office/EventAggregators/RedactionCommandEvent.cs
  100. 0 0
      PDF Office/EventAggregators/RefreshAnnotEvent.cs

+ 3 - 3
PDF Office/App.config

@@ -2,7 +2,7 @@
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="PDF_Office.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="PDF_Master.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup> 
@@ -17,7 +17,7 @@
     </assemblyBinding>
   </runtime>
   <userSettings>
-    <PDF_Office.Properties.Settings>
+	  <PDF_Master.Properties.Settings>
       <setting name="BackgroundIndex" serializeAs="String">
         <value>0</value>
       </setting>
@@ -39,6 +39,6 @@
       <setting name="IsGuidPDFUpdated" serializeAs="String">
         <value>True</value>
       </setting>
-    </PDF_Office.Properties.Settings>
+    </PDF_Master.Properties.Settings>
   </userSettings>
 </configuration>

+ 23 - 23
PDF Office/App.xaml

@@ -1,36 +1,36 @@
 <prism:PrismApplication
-    x:Class="PDF_Office.App"
+    x:Class="PDF_Master.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
-    xmlns:local="clr-namespace:PDF_Office"
+    xmlns:local="clr-namespace:PDF_Master"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Themes/Alias_Light.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Themes/Global.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/TabControlStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/SeparatorStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ButtonStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ToggleButton.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/TextBoxStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ComboxStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ListBoxStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/WindowsStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/CustomBtnStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ContainerStyles/ComboxStyle/ComboxItemStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/RadioButtonStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/PathButtonStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ImageButtonStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/PathRadioButtonDictionary.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ImageRadioButtonDictionary.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ContextMenuTextEditStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ContextMenuStyle.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Styles/ContextMenuFormStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Themes/Alias_Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Themes/Global.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/TabControlStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/SeparatorStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ButtonStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ToggleButton.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/TextBoxStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ComboxStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ListBoxStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/WindowsStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/CustomBtnStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ContainerStyles/ComboxStyle/ComboxItemStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/RadioButtonStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/PathButtonStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ImageButtonStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/PathRadioButtonDictionary.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ImageRadioButtonDictionary.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ContextMenuTextEditStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ContextMenuStyle.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Styles/ContextMenuFormStyle.xaml" />
                 <!--  Enable show customctrol's correctly UI in Xaml Designer  -->
-                <ResourceDictionary Source="pack://application:,,,/PDF Office;component/Themes/Generic.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/PDF Master;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
             <Style TargetType="{x:Type Hyperlink}">

+ 55 - 54
PDF Office/App.xaml.cs

@@ -9,55 +9,55 @@ using System.Windows;
 using System.Windows.Controls;
 using ComPDFKit.NativeMethod;
 using ComPDFKit_Conversion.Converter;
-using PDF_Office.CustomControl;
-using PDF_Office.CustomControl.SystemControl;
-using PDF_Office.ViewModels;
-using PDF_Office.Views;
-using PDF_Office.Views.BOTA;
-using PDF_Office.Views.Dialog;
-using PDF_Office.Views.HomePanel;
+using PDF_Master.CustomControl;
+using PDF_Master.CustomControl.SystemControl;
+using PDF_Master.ViewModels;
+using PDF_Master.Views;
+using PDF_Master.Views.BOTA;
+using PDF_Master.Views.Dialog;
+using PDF_Master.Views.HomePanel;
 using Prism.DryIoc;
 using Prism.Ioc;
 using Prism.Regions;
-using PDF_Office.Model;
-using PDF_Office.Views.PageEdit;
-using PDF_Office.Properties;
+using PDF_Master.Model;
+using PDF_Master.Views.PageEdit;
+using PDF_Master.Properties;
 using PDFSettings.Settings;
-using PDF_Office.Views.Tools;
-using PDF_Office.Views.Dialog.ToolsDialogs.SaftyDialogs;
-using PDF_Office.Views.Dialog.ToolsDialogs.CompressDialogs;
-using PDF_Office.Views.Dialog.PageEditDialogs;
-using PDF_Office.Helper;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePagePrinter;
-using PDF_Office.Views.PropertyPanel;
-using PDF_Office.Views.Dialog.BOTA;
-using PDF_Office.Views.PropertyPanel.AnnotPanel;
-using PDF_Office.Views.FillAndSign;
-using PDF_Office.Views.FillAndSign.PropertyPanel;
-using PDF_Office.Views.PropertyPanel.ViewModular;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
-using PDF_Office.Views.Dialog.ConverterDialogs;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageConverter;
-using PDF_Office.Views.EditTools.Watermark;
-using PDF_Office.Views.EditTools.Background;
-using PDF_Office.Views.EditTools.Bates;
-using PDF_Office.Views.EditTools.HeaderFooter;
-using PDF_Office.Views.EditTools.Redaction;
-using PDF_Office.Views.Form;
-using PDF_Office.Views.PropertyPanel.PDFEdit;
-using PDF_Office.Views.Dialog.ToolsDialogs;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageHeaderFooter;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageBates;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageWatermark;
-using PDF_Office.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageBackground;
+using PDF_Master.Views.Tools;
+using PDF_Master.Views.Dialog.ToolsDialogs.SaftyDialogs;
+using PDF_Master.Views.Dialog.ToolsDialogs.CompressDialogs;
+using PDF_Master.Views.Dialog.PageEditDialogs;
+using PDF_Master.Helper;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePagePrinter;
+using PDF_Master.Views.PropertyPanel;
+using PDF_Master.Views.Dialog.BOTA;
+using PDF_Master.Views.PropertyPanel.AnnotPanel;
+using PDF_Master.Views.FillAndSign;
+using PDF_Master.Views.FillAndSign.PropertyPanel;
+using PDF_Master.Views.PropertyPanel.ViewModular;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
+using PDF_Master.Views.Dialog.ConverterDialogs;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageConverter;
+using PDF_Master.Views.EditTools.Watermark;
+using PDF_Master.Views.EditTools.Background;
+using PDF_Master.Views.EditTools.Bates;
+using PDF_Master.Views.EditTools.HeaderFooter;
+using PDF_Master.Views.EditTools.Redaction;
+using PDF_Master.Views.Form;
+using PDF_Master.Views.PropertyPanel.PDFEdit;
+using PDF_Master.Views.Dialog.ToolsDialogs;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageHeaderFooter;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageBates;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageWatermark;
+using PDF_Master.Views.Dialog.HomePageToolsDialogs.HomePageBatchProcessing.HomePageBackground;
 using ComDocumentAIKit;
-using PDF_Office.Views.PropertyPanel.Scan;
-using PDF_Office.Views.Dialog.Redaction;
-using PDF_Office.Views.Scan;
-using PDF_Office.Views.TipContent;
+using PDF_Master.Views.PropertyPanel.Scan;
+using PDF_Master.Views.Dialog.Redaction;
+using PDF_Master.Views.Scan;
+using PDF_Master.Views.TipContent;
 using System.Windows.Threading;
-using PDF_Office.Views.Dialog.ServiceDialog;
+using PDF_Master.Views.Dialog.ServiceDialog;
 using System.Diagnostics;
 using System.Resources;
 using System.Reflection;
@@ -66,14 +66,20 @@ using System.Globalization;
 using Microsoft.AppCenter.Analytics;
 using Microsoft.AppCenter.Crashes;
 
-namespace PDF_Office
+namespace PDF_Master
 {
     /// <summary>
     /// App.xaml 的交互逻辑
     /// </summary>
     public partial class App : PrismApplication
     {
-        public static string CurrentPath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "PDF Office");
+
+        /// <summary>
+        /// 产品名称
+        /// </summary>
+        public static string Name = "PDF Master";
+
+        public static string CurrentPath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), Name);
 
         /// <summary>
         /// 内嵌文档路径
@@ -85,11 +91,6 @@ namespace PDF_Office
         /// </summary>
         public static bool IsGuidPDFUpdated = false;
 
-        /// <summary>
-        /// 产品名称
-        /// </summary>
-        public static string Name = "PDF Office";
-
         /// <summary>
         /// 当前app版本号
         /// </summary>
@@ -128,17 +129,17 @@ namespace PDF_Office
         /// <summary>
         /// 文案资源管理器  首页
         /// </summary>
-        public static ResourceManager HomePageLoader = new ResourceManager("PDF_Office.Strings.HomePage.HomePage", Assembly.GetExecutingAssembly());
+        public static ResourceManager HomePageLoader = new ResourceManager("PDF_Master.Strings.HomePage.HomePage", Assembly.GetExecutingAssembly());
 
         /// <summary>
         /// 文案资源管理器  阅读页
         /// </summary>
-        public static ResourceManager MainPageLoader = new ResourceManager("PDF_Office.Strings.MainPage.MainPage", Assembly.GetExecutingAssembly());
+        public static ResourceManager MainPageLoader = new ResourceManager("PDF_Master.Strings.MainPage.MainPage", Assembly.GetExecutingAssembly());
 
         /// <summary>
         /// 文案资源管理器  注册相关
         /// </summary>
-        public static ResourceManager ServiceLoader = new ResourceManager("PDF_Office.Strings.Service.Service", Assembly.GetExecutingAssembly());
+        public static ResourceManager ServiceLoader = new ResourceManager("PDF_Master.Strings.Service.Service", Assembly.GetExecutingAssembly());
 
         public App()
         {
@@ -421,7 +422,7 @@ namespace PDF_Office
             containerRegistry.RegisterDialog<SetPasswordDialog>(DialogNames.SetPasswordDialog);
             containerRegistry.RegisterDialog<CheckPasswordDialog>(DialogNames.CheckPasswordDialog);
             containerRegistry.RegisterDialog<DeleteSafetySettingsDialog>(DialogNames.DeleteSafetySettingsDialog);
-            containerRegistry.RegisterDialog<CompressProgressBarDialog, PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs.CompresProgressBarDialogViewModel>(DialogNames.CompressProgressBarDialog);
+            containerRegistry.RegisterDialog<CompressProgressBarDialog, PDF_Master.ViewModels.Dialog.ToolsDialogs.CompressDialogs.CompresProgressBarDialogViewModel>(DialogNames.CompressProgressBarDialog);
             containerRegistry.RegisterDialog<InsertDialog>(DialogNames.InsertDialog);
             containerRegistry.RegisterDialog<SplitDialog>(DialogNames.SplitDialog);
             containerRegistry.RegisterDialog<ExtractDialog>(DialogNames.ExtractDialog);

+ 2 - 2
PDF Office/CustomControl/AlertsMessage.xaml

@@ -1,10 +1,10 @@
 <Window
-    x:Class="PDF_Office.CustomControl.AlertsMessage"
+    x:Class="PDF_Master.CustomControl.AlertsMessage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="470"
     MinHeight="156"

+ 1 - 1
PDF Office/CustomControl/AlertsMessage.xaml.cs

@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     public enum ContentResult
     {

+ 2 - 2
PDF Office/CustomControl/BatchStatus.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="PDF_Office.CustomControl.BatchStatus"
+<UserControl x:Class="PDF_Master.CustomControl.BatchStatus"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.CustomControl"
+             xmlns:local="clr-namespace:PDF_Master.CustomControl"
              mc:Ignorable="d" 
              d:DesignHeight="16" d:DesignWidth="16">
     <Grid>

+ 1 - 1
PDF Office/CustomControl/BatchStatus.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// BatchStatus.xaml 的交互逻辑

+ 2 - 2
PDF Office/CustomControl/ColorDropBox.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.ColorDropBox"
+    x:Class="PDF_Master.CustomControl.ColorDropBox"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     MinWidth="0"
     d:DesignHeight="450"

+ 2 - 2
PDF Office/CustomControl/ColorDropBox.xaml.cs

@@ -1,4 +1,4 @@
-using PDF_Office.Helper;
+using PDF_Master.Helper;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// ColorDropBox.xaml 的交互逻辑

+ 3 - 3
PDF Office/CustomControl/ColorDropBoxPop.xaml

@@ -1,11 +1,11 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.ColorDropBoxPop"
+    x:Class="PDF_Master.CustomControl.ColorDropBoxPop"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:mainpage="clr-namespace:PDF_Office.Strings.MainPage"
+    xmlns:mainpage="clr-namespace:PDF_Master.Strings.MainPage"
     Width="194"
     Height="auto"
     d:DesignHeight="450"

+ 1 - 1
PDF Office/CustomControl/ColorDropBoxPop.xaml.cs

@@ -16,7 +16,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using WinForm = System.Windows.Forms;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// ColorDropBoxPop.xaml 的交互逻辑

+ 2 - 2
PDF Office/CustomControl/CommonWritableComboBox.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="PDF_Office.CustomControl.CommonWritableComboBox"
+<UserControl x:Class="PDF_Master.CustomControl.CommonWritableComboBox"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.CustomControl"
+             xmlns:local="clr-namespace:PDF_Master.CustomControl"
              mc:Ignorable="d" 
               d:DesignHeight="32" d:DesignWidth="66">
     <UserControl.Resources>

+ 1 - 1
PDF Office/CustomControl/CommonWritableComboBox.xaml.cs

@@ -16,7 +16,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using static ImTools.ImMap;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// CommonWritableComboBox.xaml 的交互逻辑

+ 5 - 5
PDF Office/CustomControl/CompositeControl/ColorContent.xaml

@@ -1,13 +1,13 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.CompositeControl.ColorContent"
+    x:Class="PDF_Master.CustomControl.CompositeControl.ColorContent"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:convert="clr-namespace:PDF_Office.DataConvert"
-    xmlns:cus="clr-namespace:PDF_Office.CustomControl"
+    xmlns:convert="clr-namespace:PDF_Master.DataConvert"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl.CompositeControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:mainpage="clr-namespace:PDF_Office.Strings.MainPage"
+    xmlns:mainpage="clr-namespace:PDF_Master.Strings.MainPage"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">

+ 3 - 3
PDF Office/CustomControl/CompositeControl/ColorContent.xaml.cs

@@ -1,5 +1,5 @@
-using PDF_Office.Helper;
-using PDF_Office.Model.AnnotPanel;
+using PDF_Master.Helper;
+using PDF_Master.Model.AnnotPanel;
 using PDFSettings;
 using Prism.Mvvm;
 using System;
@@ -18,7 +18,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.CompositeControl
+namespace PDF_Master.CustomControl.CompositeControl
 {
     public class ColorItem: BindableBase
     {

+ 3 - 3
PDF Office/CustomControl/CompositeControl/ColorMenuItem.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="PDF_Office.CustomControl.CompositeControl.ColorMenuItem"
+<UserControl x:Class="PDF_Master.CustomControl.CompositeControl.ColorMenuItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.CustomControl.CompositeControl"
-             xmlns:convert="clr-namespace:PDF_Office.DataConvert"
+             xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
+             xmlns:convert="clr-namespace:PDF_Master.DataConvert"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>

+ 1 - 1
PDF Office/CustomControl/CompositeControl/ColorMenuItem.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.CompositeControl
+namespace PDF_Master.CustomControl.CompositeControl
 {
     /// <summary>
     /// ColorMenuItem.xaml 的交互逻辑

+ 3 - 3
PDF Office/CustomControl/CompositeControl/ColorSubContent.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="PDF_Office.CustomControl.CompositeControl.ColorSubContent"
+<UserControl x:Class="PDF_Master.CustomControl.CompositeControl.ColorSubContent"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:cus="clr-namespace:PDF_Office.CustomControl"
-             xmlns:local="clr-namespace:PDF_Office.CustomControl.CompositeControl"
+             xmlns:cus="clr-namespace:PDF_Master.CustomControl"
+             xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>

+ 1 - 1
PDF Office/CustomControl/CompositeControl/ColorSubContent.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.CompositeControl
+namespace PDF_Master.CustomControl.CompositeControl
 {
     //类的说明:
     //复合控件:调色版

+ 2 - 2
PDF Office/CustomControl/CompositeControl/CustomComboControl.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.CompositeControl.CustomComboControl"
+    x:Class="PDF_Master.CustomControl.CompositeControl.CustomComboControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl.CompositeControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="usercontrol"
     d:DesignHeight="450"

+ 1 - 1
PDF Office/CustomControl/CompositeControl/CustomComboControl.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.CompositeControl
+namespace PDF_Master.CustomControl.CompositeControl
 {
     //用法:
     // IsValueContent为ture时,使用ValueStr作为集合某项的值

+ 2 - 2
PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.CompositeControl.SlidComboControl"
+    x:Class="PDF_Master.CustomControl.CompositeControl.SlidComboControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl.CompositeControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     x:Name="usercontrol"
     d:DesignHeight="64"

+ 1 - 1
PDF Office/CustomControl/CompositeControl/SlidComboControl.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.CompositeControl
+namespace PDF_Master.CustomControl.CompositeControl
 {
 
     /// <summary>

+ 3 - 3
PDF Office/CustomControl/CompositeControl/SlidContent.xaml

@@ -1,10 +1,10 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.CompositeControl.SlidContent"
+    x:Class="PDF_Master.CustomControl.CompositeControl.SlidContent"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cus="clr-namespace:PDF_Office.CustomControl"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl.CompositeControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="450"
     d:DesignWidth="800"

+ 2 - 2
PDF Office/CustomControl/CompositeControl/SlidContent.xaml.cs

@@ -1,4 +1,4 @@
-using PDF_Office.Helper;
+using PDF_Master.Helper;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.CompositeControl
+namespace PDF_Master.CustomControl.CompositeControl
 {
     /// <summary>
     /// ThicknessContent.xaml 的交互逻辑

+ 3 - 3
PDF Office/CustomControl/CompositeControl/SlidContentPop.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="PDF_Office.CustomControl.CompositeControl.SlidContentPop"
+<UserControl x:Class="PDF_Master.CustomControl.CompositeControl.SlidContentPop"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.CustomControl.CompositeControl"
-             xmlns:mainpage="clr-namespace:PDF_Office.Strings.MainPage"
+             xmlns:local="clr-namespace:PDF_Master.CustomControl.CompositeControl"
+             xmlns:mainpage="clr-namespace:PDF_Master.Strings.MainPage"
              mc:Ignorable="d" 
              x:Name="usercontorls"
              d:DesignHeight="450" d:DesignWidth="800">

+ 1 - 1
PDF Office/CustomControl/CompositeControl/SlidContentPop.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.CompositeControl
+namespace PDF_Master.CustomControl.CompositeControl
 {
     /// <summary>
     /// ThicknessContentPop.xaml 的交互逻辑

+ 1 - 1
PDF Office/CustomControl/CustomIconToggleBtn.cs

@@ -9,7 +9,7 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     public class CustomIconToggleBtn: ToggleButton
     {

+ 1 - 1
PDF Office/CustomControl/CustomImageControl.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     internal class CustomImageControl : FrameworkElement
     {

+ 1 - 1
PDF Office/CustomControl/DialogContent.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// 不能使用usercontrol来实现该模块 会导致content里的控件无法命名

+ 2 - 2
PDF Office/CustomControl/Form/FormFieldCombox.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.Form.FormFieldCombox"
+    x:Class="PDF_Master.CustomControl.Form.FormFieldCombox"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl.Form"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl.Form"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="450"
     d:DesignWidth="800"

+ 2 - 2
PDF Office/CustomControl/Form/FormFieldCombox.xaml.cs

@@ -1,4 +1,4 @@
-using PDF_Office.Model.From;
+using PDF_Master.Model.From;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.Form
+namespace PDF_Master.CustomControl.Form
 {
     /// <summary>
     /// FormFieldCombox.xaml 的交互逻辑

+ 3 - 3
PDF Office/CustomControl/Form/LayoutAglinContent.xaml

@@ -1,11 +1,11 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.Form.LayoutAglinContent"
+    x:Class="PDF_Master.CustomControl.Form.LayoutAglinContent"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Convert="clr-namespace:PDF_Office.DataConvert"
+    xmlns:Convert="clr-namespace:PDF_Master.DataConvert"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl.Form"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl.Form"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     x:Name="usercontrol"

+ 1 - 1
PDF Office/CustomControl/Form/LayoutAglinContent.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl.Form
+namespace PDF_Master.CustomControl.Form
 {
     /// <summary>
     /// LayoutAglinContent.xaml 的交互逻辑

+ 1 - 1
PDF Office/CustomControl/IconAndTextTabItem.cs

@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// 显示图标和选中文字颜色的TabItem

+ 1 - 1
PDF Office/CustomControl/ImageButton.cs

@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     public class ImageButton : Button
     {

+ 1 - 1
PDF Office/CustomControl/ImageRadioButton .cs

@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     public class ImageRadioButton : RadioButton
     {

+ 1 - 1
PDF Office/CustomControl/ListBoxItemToolBar.cs

@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     public class ListItemQuickTool : ListBoxItem
     {

+ 2 - 2
PDF Office/CustomControl/LoadingControl.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.LoadingControl"
+    x:Class="PDF_Master.CustomControl.LoadingControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="450"
     d:DesignWidth="800"

+ 1 - 1
PDF Office/CustomControl/LoadingControl.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// LoadingControl.xaml 的交互逻辑

+ 1 - 1
PDF Office/CustomControl/MenuItemWithPath.cs

@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// 带Path图案的Menuitem 图案颜色跟随文字颜色变化

+ 1 - 1
PDF Office/CustomControl/MessageBoxEx.cs

@@ -10,7 +10,7 @@ using System.Drawing;
 using System.Management;
 using System.Windows.Forms.VisualStyles;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// 自定义可以更改按钮文字的Messagebox

+ 2 - 2
PDF Office/CustomControl/NumericUpDown.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.NumericUpDown"
+    x:Class="PDF_Master.CustomControl.NumericUpDown"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="32"
     d:DesignWidth="80"

+ 1 - 1
PDF Office/CustomControl/NumericUpDown.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// NumericUpDown.xaml 的交互逻辑

+ 2 - 2
PDF Office/CustomControl/PageControl.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="PDF_Office.CustomControl.PageControl"
+<UserControl x:Class="PDF_Master.CustomControl.PageControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.CustomControl"
+             xmlns:local="clr-namespace:PDF_Master.CustomControl"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>

+ 1 - 1
PDF Office/CustomControl/PageControl.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// PageControl.xaml 的交互逻辑

+ 2 - 2
PDF Office/CustomControl/PageTurningPreview.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="PDF_Office.CustomControl.PageTurningPreview"
+<UserControl x:Class="PDF_Master.CustomControl.PageTurningPreview"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:PDF_Office.CustomControl"
+             xmlns:local="clr-namespace:PDF_Master.CustomControl"
              mc:Ignorable="d" 
              Height="320" Width="212">
     <Border Width="212" Height="320" Background="{StaticResource color.sys.layout.mg}"  CornerRadius="8">

+ 2 - 2
PDF Office/CustomControl/PageTurningPreview.xaml.cs

@@ -1,6 +1,6 @@
 using ComPDFKit.PDFDocument;
 using ComPDFKit.PDFPage;
-using PDF_Office.Helper;
+using PDF_Master.Helper;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -19,7 +19,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Xml.Linq;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// PageTurningPreview.xaml 的交互逻辑

+ 3 - 3
PDF Office/CustomControl/PaginationControl.xaml

@@ -1,10 +1,10 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.PaginationControl"
+    x:Class="PDF_Master.CustomControl.PaginationControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:cus="clr-namespace:PDF_Office.CustomControl"
+    xmlns:cus="clr-namespace:PDF_Master.CustomControl"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Height="36"
     d:DesignHeight="450"

+ 1 - 1
PDF Office/CustomControl/PaginationControl.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// PaginationControl.xaml 的交互逻辑

+ 1 - 1
PDF Office/CustomControl/PathButton.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     public class PathButton : Button
     {

+ 1 - 1
PDF Office/CustomControl/PathRadioButton.cs

@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     public class PathRadioButton : RadioButton
     {

+ 1 - 1
PDF Office/CustomControl/ScanViewControl/CustomDraw.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl.ScanViewControl
+namespace PDF_Master.CustomControl.ScanViewControl
 {
     public class CustomDraw : DrawingVisual
     {

+ 2 - 2
PDF Office/CustomControl/ScanViewControl/CustomPanel.cs

@@ -1,4 +1,4 @@
-using PDF_Office.Helper;
+using PDF_Master.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace PDF_Office.CustomControl.ScanViewControl
+namespace PDF_Master.CustomControl.ScanViewControl
 {
     public class CustomPanel : Panel
     {

+ 1 - 1
PDF Office/CustomControl/ScanViewControl/DrawRect.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl.ScanViewControl
+namespace PDF_Master.CustomControl.ScanViewControl
 {
 
     public class DrawRect : DrawingVisual

+ 1 - 1
PDF Office/CustomControl/SystemControl/CustomCommandAction .cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 
-namespace PDF_Office.CustomControl.SystemControl
+namespace PDF_Master.CustomControl.SystemControl
 {
     /// <summary>
     /// 自动传送事件参数的辅助类

+ 2 - 2
PDF Office/CustomControl/SystemControl/InterTabClient.cs

@@ -5,11 +5,11 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using Dragablz;
-using PDF_Office.Views;
+using PDF_Master.Views;
 using Prism.Ioc;
 using Prism.Regions;
 
-namespace PDF_Office.CustomControl.SystemControl
+namespace PDF_Master.CustomControl.SystemControl
 {
     public class InterTabClient : IInterTabClient
     {

+ 1 - 1
PDF Office/CustomControl/SystemControl/RoutedEventTrigger.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace PDF_Office.CustomControl.SystemControl
+namespace PDF_Master.CustomControl.SystemControl
 {
     /// <summary>
     /// 用于辅助绑定ScrollChanged等不方便直接绑定command的系统

+ 3 - 3
PDF Office/CustomControl/SystemControl/TabablzRegionBehavior.cs

@@ -1,6 +1,6 @@
 using Dragablz;
-using PDF_Office.EventAggregators;
-using PDF_Office.Views;
+using PDF_Master.EventAggregators;
+using PDF_Master.Views;
 using Prism.Events;
 using Prism.Regions;
 using System;
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 
-namespace PDF_Office.CustomControl.SystemControl
+namespace PDF_Master.CustomControl.SystemControl
 {
     public class DragablzWindowBehavior : RegionBehavior
     {

+ 1 - 1
PDF Office/CustomControl/TextBoxEx.cs

@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// 带预文本和圆角的textbox

+ 2 - 2
PDF Office/CustomControl/TextBoxWithTip.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.TextBoxWithTip"
+    x:Class="PDF_Master.CustomControl.TextBoxWithTip"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="450"
     d:DesignWidth="800"

+ 1 - 1
PDF Office/CustomControl/TextBoxWithTip.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// TextBoxWithTip.xaml 的交互逻辑

+ 2 - 2
PDF Office/CustomControl/ToastControl.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.ToastControl"
+    x:Class="PDF_Master.CustomControl.ToastControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Name="Toast"
     Width="auto"

+ 1 - 1
PDF Office/CustomControl/ToastControl.xaml.cs

@@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// 渐隐提示控件

+ 2 - 2
PDF Office/CustomControl/WritableComboBox.xaml

@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="PDF_Office.CustomControl.WritableComboBox"
+    x:Class="PDF_Master.CustomControl.WritableComboBox"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:PDF_Office.CustomControl"
+    xmlns:local="clr-namespace:PDF_Master.CustomControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     d:DesignHeight="24"
     d:DesignWidth="200"

+ 2 - 2
PDF Office/CustomControl/WritableComboBox.xaml.cs

@@ -1,6 +1,6 @@
 using ImTools;
 using Newtonsoft.Json.Linq;
-using PDF_Office.Helper;
+using PDF_Master.Helper;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -17,7 +17,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace PDF_Office.CustomControl
+namespace PDF_Master.CustomControl
 {
     /// <summary>
     /// WritableComboBox.xaml 的交互逻辑

+ 1 - 1
PDF Office/DataConvert/AnnotateFontSizeConverter.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class AnnotateFontSizeConverter : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/BoolToBrushConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     internal class BoolToBrushConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/BoolToTextWrapConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class BoolToTextWrapConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/BoolToVisible.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class BoolToVisible : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/CenterToolTipConverter .cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class CenterToolTipConverter : IMultiValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/ColorBrushConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     /// <summary>
     /// Color to SolidColorBrush

+ 1 - 1
PDF Office/DataConvert/CreateTimeToDate.cs

@@ -7,7 +7,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class CreateTimeToDate : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/FileFormatToIconConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class DateTimeToStringConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/FileToImageSourceConvert.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     /// <summary>
     /// 文件绝对路径 转ImageSource  转换器

+ 1 - 1
PDF Office/DataConvert/GroupHeaderConverter.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class GroupHeaderConverter : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/IndexConverter .cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class IndexConverter : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/IntAndTagToBoolMultiBinding.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     class IntAndTagToBoolMultiBinding : IMultiValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/IntToBooleanConvert.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class IntToBooleanConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/IntToColorBrush.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     class IntToColorBrush : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/InvertBoolConvert.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class InvertBoolConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/ListCountToVisible.cs.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class ListCountToVisible : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/ObjectConvert.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     /// <summary>
     /// CommandParameter 多参数传递

+ 1 - 1
PDF Office/DataConvert/PropertyPanelVisible.cs

@@ -9,7 +9,7 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
 
 

+ 1 - 1
PDF Office/DataConvert/SignatureButtonConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class SignatureButtonConvert : IMultiValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/StringToDateConvert.cs

@@ -7,7 +7,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     /// <summary>
     /// 用于注释 书签等的时间转换

+ 1 - 1
PDF Office/DataConvert/StringToVisibleConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class StringToVisibleConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/TextAlignToCheckedConverter.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
 
     public class TextAlignToCheckedConverter : IValueConverter

+ 1 - 1
PDF Office/DataConvert/UnVisivleConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class UnVisivleConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/VisibleToBoolConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class VisibleToBoolConvert : IValueConverter
     {

+ 1 - 1
PDF Office/DataConvert/WidthConvert.cs

@@ -9,7 +9,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace PDF_Office.DataConvert
+namespace PDF_Master.DataConvert
 {
     public class WidthConvert : IValueConverter
     {

+ 1 - 1
PDF Office/EventAggregators/CleanSelectAllEvent.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
     public class CleanSelectAllArgs
     {

+ 1 - 1
PDF Office/EventAggregators/DragablzWindowEvent.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Dragablz;
 using Prism.Events;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
     public class DragablzWindowEvent : PubSubEvent<DragablzWindowEventArgs>
     {

+ 5 - 5
PDF Office/EventAggregators/EditToolsEvent.cs

@@ -1,8 +1,8 @@
 using ComPDFKitViewer.PdfViewer;
-using PDF_Office.Model.EditTools.Background;
-using PDF_Office.Model.EditTools.Watermark;
-using PDF_Office.Model.EditTools.Bates;
-using PDF_Office.Model.EditTools.HeaderFooter;
+using PDF_Master.Model.EditTools.Background;
+using PDF_Master.Model.EditTools.Watermark;
+using PDF_Master.Model.EditTools.Bates;
+using PDF_Master.Model.EditTools.HeaderFooter;
 using PDFSettings;
 using Prism.Commands;
 using Prism.Events;
@@ -13,7 +13,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
 
     public enum EnumCloseMode

+ 1 - 1
PDF Office/EventAggregators/FillAndSignEvent.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
 
     public class FillAndSigntEventArgs

+ 1 - 1
PDF Office/EventAggregators/OpenFileEvent.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
     /// <summary>
     /// 用于通知打开文件的事件类型

+ 1 - 1
PDF Office/EventAggregators/PageEditNotifyEvent.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
     /// <summary>
     /// 页面编辑 Vm通知View更新页面的事件

+ 1 - 1
PDF Office/EventAggregators/PageEditRefreshEvent.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
     /// <summary>
     /// Xaml用于通知页面编辑VM刷新图像的事件

+ 1 - 1
PDF Office/EventAggregators/RedactionCommandEvent.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PDF_Office.EventAggregators
+namespace PDF_Master.EventAggregators
 {
     public class RedactionCommandEventArgs
     {

+ 0 - 0
PDF Office/EventAggregators/RefreshAnnotEvent.cs


Some files were not shown because too many files changed in this diff