liuaoran 1 год назад
Родитель
Сommit
5e8e5df88c

+ 10 - 7
Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj

@@ -45,12 +45,6 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ComPDFKit.Desk, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.10.0\lib\ComPDFKit.Desk.dll</HintPath>
-    </Reference>
-    <Reference Include="ComPDFKit.Viewer, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.10.0\lib\ComPDFKit.Viewer.dll</HintPath>
-    </Reference>
     <Reference Include="Nager.Country, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nager.Country.4.0.0\lib\netstandard2.0\Nager.Country.dll</HintPath>
     </Reference>
@@ -1083,7 +1077,16 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
+      <Name>ComPDFKit.Desk</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitDesktop\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj">
+      <Project>{18ec356d-8130-49d4-b4e6-ac290e1065b7}</Project>
+      <Name>ComPDFKit.Viewer</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\ComPDFKit.NetFramework.1.10.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.1.10.0\build\ComPDFKit.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 30 - 20
Demo/Examples/Compdfkit_Tools/PDFView/RegularViewerControl.xaml.cs

@@ -44,14 +44,14 @@ namespace Compdfkit_Tools.PDFView
                 return false;
             }
         }
-        
+
         public RegularViewerControl()
         {
             InitializeComponent();
             panelState.PropertyChanged -= PanelState_PropertyChanged;
             panelState.PropertyChanged += PanelState_PropertyChanged;
         }
-        
+
         private void PanelState_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(PanelState.IsLeftPanelExpand))
@@ -75,7 +75,7 @@ namespace Compdfkit_Tools.PDFView
                 }
             }
         }
-        
+
         public void ExpandLeftPanel(bool isExpand)
         {
             BotaContainer.Visibility = isExpand ? Visibility.Visible : Visibility.Collapsed;
@@ -91,26 +91,26 @@ namespace Compdfkit_Tools.PDFView
                 BodyGrid.ColumnDefinitions[1].Width = new GridLength(0);
             }
         }
-        
+
         public void ExpandRightPropertyPanel(UIElement propertytPanel, Visibility visible)
         {
             PropertyContainer.Width = 260;
             PropertyContainer.Child = propertytPanel;
             PropertyContainer.Visibility = visible;
         }
-        
+
         #region Init PDFViewer
 
         private void InitialControl()
         {
             PdfViewControl.PDFView?.SetMouseMode(MouseModes.Viewer);
             PdfViewControl.PDFView?.SetShowLink(true);
-            PDFGrid.Child = PdfViewControl; 
+            PDFGrid.Child = PdfViewControl;
             PdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
             PdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
             PdfViewControl.PDFView.SetFormFieldHighlight(true);
         }
-        
+
         public void InitWithPDFViewer(CPDFViewer pdfViewer)
         {
             PdfViewControl.PDFView = pdfViewer;
@@ -118,7 +118,7 @@ namespace Compdfkit_Tools.PDFView
             FloatPageTool.InitWithPDFViewer(pdfViewer);
             InitialControl();
             DataContext = this;
-            if(PdfViewControl!=null && PdfViewControl.PDFView!=null)
+            if (PdfViewControl != null && PdfViewControl.PDFView != null)
             {
                 PdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
                 PdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
@@ -132,15 +132,15 @@ namespace Compdfkit_Tools.PDFView
             if ((e is WidgetSignArgs args))
             {
                 var signatureWidget = args.Sign;
-                if(signatureWidget != null)
+                if (signatureWidget != null)
                 {
                     CPDFSignature sig = signatureWidget.GetSignature(PdfViewControl.PDFView.Document);
-                    if (signatureWidget.IsSigned() && sig!=null && sig?.SignerList.Count > 0)
+                    if (signatureWidget.IsSigned() && sig != null && sig?.SignerList.Count > 0)
                     {
                         return;
                     }
                 }
-                
+
                 if (args.WidgetType == C_WIDGET_TYPE.WIDGET_SIGNATUREFIELDS)
                 {
                     panelState.RightPanel = PanelState.RightPanelState.PropertyPanel;
@@ -150,7 +150,7 @@ namespace Compdfkit_Tools.PDFView
                 }
             }
         }
-        
+
         public void CancelWidgetClickHandler()
         {
             if (PdfViewControl != null && PdfViewControl.PDFView != null)
@@ -163,12 +163,12 @@ namespace Compdfkit_Tools.PDFView
         {
             this.BotaContainer.Child = botaControl;
         }
-        
+
         public void SetDisplaySettingsControl(CPDFDisplaySettingsControl displaySettingsControl)
         {
             this.displaySettingsControl = displaySettingsControl;
         }
-        
+
         public void SetSignatureStatusBarControl(SignatureStatusBarControl signatureStatusBarControl)
         {
             this.signatureStatusBarControl = signatureStatusBarControl;
@@ -184,16 +184,16 @@ namespace Compdfkit_Tools.PDFView
         }
 
         #endregion
-        
+
         public void ClearViewerControl()
         {
             PDFGrid.Child = null;
             BotaContainer.Child = null;
-            PropertyContainer.Child= null;
+            PropertyContainer.Child = null;
             SignatureStatusBorder.Child = null;
             displaySettingsControl = null;
         }
-        
+
         #region PropertyChanged
 
         /// <summary>
@@ -214,7 +214,7 @@ namespace Compdfkit_Tools.PDFView
         }
 
         #endregion
-        
+
         #region Context Menu
 
         private void ExtraImage_Click(object sender, RoutedEventArgs e)
@@ -295,7 +295,7 @@ namespace Compdfkit_Tools.PDFView
                     {
                         if (PdfViewControl != null)
                         {
-                            double newZoom = CommandHelper.CheckZoomLevel(zoomLevelList,PdfViewControl.PDFView.ZoomFactor + 0.01, true);
+                            double newZoom = CommandHelper.CheckZoomLevel(zoomLevelList, PdfViewControl.PDFView.ZoomFactor + 0.01, true);
                             PdfViewControl.PDFView?.Zoom(newZoom);
                         }
                     };
@@ -308,7 +308,7 @@ namespace Compdfkit_Tools.PDFView
                     {
                         if (PdfViewControl != null)
                         {
-                            double newZoom = CommandHelper.CheckZoomLevel(zoomLevelList,PdfViewControl.PDFView.ZoomFactor - 0.01, false);
+                            double newZoom = CommandHelper.CheckZoomLevel(zoomLevelList, PdfViewControl.PDFView.ZoomFactor - 0.01, false);
                             PdfViewControl.PDFView?.Zoom(newZoom);
                         }
                     };
@@ -385,6 +385,16 @@ namespace Compdfkit_Tools.PDFView
             }
         }
 
+        private void PopupMenu_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
+        private void CopyText_Click(object sender, RoutedEventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
         #endregion
 
         private void UserControl_Unloaded(object sender, RoutedEventArgs e)

+ 12 - 0
Demo/Examples/Compdfkit_Tools/Security/Watermark/AddWatermark/WatermarkDialog.xaml.cs

@@ -17,6 +17,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using static Compdfkit_Tools.PDFControl.PageRangeDialog;
+using MessageBox = System.Windows.MessageBox;
+
 
 namespace Compdfkit_Tools.PDFControl
 {
@@ -494,6 +496,16 @@ namespace Compdfkit_Tools.PDFControl
 
         private void ConfirmBtn_Click(object sender, RoutedEventArgs e)
         {
+            if(watermarkData.Type == C_Watermark_Type.WATERMARK_TYPE_TEXT && string.IsNullOrEmpty(watermarkData.Text))
+            {
+                MessageBox.Show("Watermark text is empty", "Warning", MessageBoxButton.OK);
+                return;
+            }
+            if (watermarkData.Type == C_Watermark_Type.WATERMARK_TYPE_IMG && string.IsNullOrEmpty(watermarkData.ImagePath))
+            {
+                MessageBox.Show("Watermark image is empty", "Warning", MessageBoxButton.OK);
+                return;
+            }
             this.Close();
             WindowClosed?.Invoke(weakReference.Target,  watermarkData);
         }

+ 28 - 0
Demo/Examples/Examlpes.sln

@@ -114,6 +114,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "BookmarkTest", "Samples\Boo
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DigitalSignatureTest", "Samples\DigitalSignatureTest\VB\DigitalSignatureTest.vbproj", "{84A958E6-C1DA-42C4-88E5-EBF4E3E632FE}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComPDFKit.Desk", "..\..\..\compdfkit\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj", "{56E518AD-C126-4B48-9A09-0A64C87020E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComPDFKit.Viewer", "..\..\..\compdfkit\ComPDFKit\ComPDFKitDesktop\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj", "{18EC356D-8130-49D4-B4E6-AC290E1065B7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -722,6 +726,30 @@ Global
 		{84A958E6-C1DA-42C4-88E5-EBF4E3E632FE}.Release|x64.Build.0 = Release|Any CPU
 		{84A958E6-C1DA-42C4-88E5-EBF4E3E632FE}.Release|x86.ActiveCfg = Release|Any CPU
 		{84A958E6-C1DA-42C4-88E5-EBF4E3E632FE}.Release|x86.Build.0 = Release|Any CPU
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x64.ActiveCfg = Debug|x64
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x64.Build.0 = Debug|x64
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x86.ActiveCfg = Debug|x86
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x86.Build.0 = Debug|x86
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x64.ActiveCfg = Release|x64
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x64.Build.0 = Release|x64
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x86.ActiveCfg = Release|x86
+		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x86.Build.0 = Release|x86
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x64.ActiveCfg = Debug|x64
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x64.Build.0 = Debug|x64
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x64.ActiveCfg = Release|x64
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x64.Build.0 = Release|x64
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 3 - 0
Demo/Examples/PDFViewer/MainPage.xaml.cs

@@ -186,6 +186,9 @@ namespace PDFViewer
             LoadCustomControl();
             panelState.PropertyChanged -= PanelState_PropertyChanged;
             panelState.PropertyChanged += PanelState_PropertyChanged;
+
+            pdfViewer.PDFView.SetShowLink(Properties.Settings.Default.IsHighlightLinkArea);
+            pdfViewer.PDFView.SetFormFieldHighlight(Properties.Settings.Default.IsHighlightFormArea);
         }
 
         /// <summary>

+ 12 - 12
Demo/Examples/PDFViewer/MainWindow.xaml.cs

@@ -64,7 +64,7 @@ namespace PDFViewer
                 if (LoadLastOpenedDocuments())
                 {
                     TabControl.SelectedIndex = Properties.Settings.Default.LastSelectedFileIndex;
-                    if(TabControl.SelectedIndex == -1)
+                    if (TabControl.SelectedIndex == -1)
                     {
                         HomePageButton.IsToggled = true;
                     }
@@ -91,7 +91,7 @@ namespace PDFViewer
             string defaultFilePath = "PDF32000_2008.pdf";
             TabControlLoadDocument(defaultFilePath);
         }
-        
+
         private bool LoadLastOpenedDocuments()
         {
             if (Properties.Settings.Default.LastOpenedFiles != null && Properties.Settings.Default.LastOpenedFiles.Count > 0)
@@ -108,7 +108,7 @@ namespace PDFViewer
         private void TabControl_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             var tabablz = sender as Dragablz.TabablzControl;
-            if(tabablz.SelectedIndex != -1)
+            if (tabablz.SelectedIndex != -1)
             {
                 HomePageButton.IsToggled = false;
             }
@@ -120,26 +120,27 @@ namespace PDFViewer
             {
                 TabControlLoadDocument(args.FilePath, args.FeatureName);
             }
-            else if(args.OperationType == FileOperationType.CreateNewFile)
+            else if (args.OperationType == FileOperationType.CreateNewFile)
             {
                 TabItemExt tabItem = new TabItemExt();
                 MainPage viewPage = new MainPage();
                 CPDFDocument document = CPDFDocument.CreateDocument();
+                document.SetInfo(new CPDFInfo
+                { Author = Properties.Settings.Default.DocumentAuthor, Creator = "ComPDFKit", CreationDate = DateTime.Now.ToString(),Subject="Document", Producer="ComPDFKit" , Keywords="Document", Version="1.11.0"});
                 document.InsertPage(0, 210, 273, "");
-                
                 viewPage.CheckExistBeforeOpenFileEvent -= ViewPage_CheckExistBeforeOpenFileEvent;
                 viewPage.FileChangeEvent -= ViewPage_FileChangeEvent;
                 viewPage.AfterSaveAsFileEvent -= ViewPage_AfterSaveAsFileEvent;
                 viewPage.CheckExistBeforeOpenFileEvent += ViewPage_CheckExistBeforeOpenFileEvent;
                 viewPage.FileChangeEvent += ViewPage_FileChangeEvent;
                 viewPage.AfterSaveAsFileEvent += ViewPage_AfterSaveAsFileEvent;
-                
+
                 viewPage.InitWithDocument(document);
                 tabItem.Content = viewPage;
                 tabItem.IsSelected = true;
                 tabItem.FileName = "Blank Page.pdf";
                 tabItem.Tag = "Blank Page.pdf";
-                
+
                 TabControl.Items.Add(tabItem);
 
                 viewPage.CanSave = true;
@@ -157,7 +158,7 @@ namespace PDFViewer
 
         private void ViewPage_AfterSaveAsFileEvent(object sender, string e)
         {
-            if(sender is MainPage mainPage)
+            if (sender is MainPage mainPage)
             {
                 var tabItem = (from object t in TabControl.Items select t as TabItemExt).FirstOrDefault(item => Equals(item.Content, mainPage));
                 if (tabItem != null)
@@ -168,7 +169,7 @@ namespace PDFViewer
                 mainPage.pdfViewer.PDFView.CloseDocument();
                 mainPage.pdfViewer.PDFView.InitDocument(e);
                 mainPage.pdfViewer.PDFView.Load();
-                
+
                 App.OpenedFilePathList.Add(e);
             }
         }
@@ -237,7 +238,6 @@ namespace PDFViewer
                 {
                     viewPage.SetFeatureMode(featureName);
                 };
-
             }
         }
 
@@ -400,7 +400,7 @@ namespace PDFViewer
             var dragablzItem = FindParentDragablzItem(button);
             var tabControl = FindParentTabControl(dragablzItem);
             MainPage mainPage = (dragablzItem.Content as TabItemExt).Content as MainPage;
-            if(mainPage == null)
+            if (mainPage == null)
             {
                 return;
             }
@@ -473,7 +473,7 @@ namespace PDFViewer
                 TabItemExt item = TabControl.Items[0] as TabItemExt;
 
                 MainPage mainPage = item.Content as MainPage;
-                if(mainPage == null)
+                if (mainPage == null)
                 {
                     count--;
                     continue;

+ 8 - 6
Demo/Examples/PDFViewer/PDFViewer.csproj

@@ -42,12 +42,6 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ComPDFKit.Desk, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.10.0\lib\ComPDFKit.Desk.dll</HintPath>
-    </Reference>
-    <Reference Include="ComPDFKit.Viewer, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.10.0\lib\ComPDFKit.Viewer.dll</HintPath>
-    </Reference>
     <Reference Include="Dragablz">
       <HintPath>.\Dragablz.dll</HintPath>
     </Reference>
@@ -146,6 +140,14 @@
     <Resource Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
+      <Name>ComPDFKit.Desk</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitDesktop\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj">
+      <Project>{18ec356d-8130-49d4-b4e6-ac290e1065b7}</Project>
+      <Name>ComPDFKit.Viewer</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
       <Name>Compdfkit_Tools</Name>

+ 8 - 6
Demo/Examples/Viewer/Viewer.csproj

@@ -41,12 +41,6 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ComPDFKit.Desk, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.10.0\lib\ComPDFKit.Desk.dll</HintPath>
-    </Reference>
-    <Reference Include="ComPDFKit.Viewer, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.10.0\lib\ComPDFKit.Viewer.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationFramework.Aero2, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\PresentationFramework.Aero2.1.0.1\lib\PresentationFramework.Aero2.dll</HintPath>
     </Reference>
@@ -122,6 +116,14 @@
     <Resource Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
+      <Name>ComPDFKit.Desk</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitDesktop\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj">
+      <Project>{18ec356d-8130-49d4-b4e6-ac290e1065b7}</Project>
+      <Name>ComPDFKit.Viewer</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
       <Name>Compdfkit_Tools</Name>