Merge branch 'compdfkit_demo_win_dev' into compdfkit_demo_win_rebuild

# Conflicts:
#	Demo/Examples/Annotations/Annotations.csproj
#	Demo/Examples/Annotations/App.xaml.cs
#	Demo/Examples/Annotations/MainWindow.xaml.cs
#	Demo/Examples/Annotations/Properties/AssemblyInfo.cs
#	Demo/Examples/Annotations/packages.config
#	Demo/Examples/Compdfkit_Tools/Annotation/AnnotationControl/AnnotationControl.xaml.cs
#	Demo/Examples/Compdfkit_Tools/Common/BarControl/CPDFBOTABarControl.xaml.cs
#	Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj
#	Demo/Examples/Compdfkit_Tools/Edit/ContentEditCOntrol/ContentEditControl.xaml.cs
#	Demo/Examples/Compdfkit_Tools/Edit/PDFContentEditControl.xaml.cs
#	Demo/Examples/Compdfkit_Tools/Edit/PDFImageEdit/PDFImageEditControl/PDFImageEditControl.xaml.cs
#	Demo/Examples/Compdfkit_Tools/Form/Property/ComboBoxProperty.xaml.cs
#	Demo/Examples/Compdfkit_Tools/Measure/MeasureSettingPanel.xaml.cs
#	Demo/Examples/Compdfkit_Tools/PDFView/PDFSearch/PDFSearchControl/CPDFSearchControl.xaml.cs
#	Demo/Examples/Compdfkit_Tools/PDFView/PDFSearch/PDFSearchUI/CPDFSearchInputUI.xaml.cs
#	Demo/Examples/Compdfkit_Tools/PDFView/PDFSearch/PDFSearchUI/CPDFSearchResultUI.xaml.cs
#	Demo/Examples/Compdfkit_Tools/PDFView/RegularViewerControl.xaml.cs
#	Demo/Examples/Compdfkit_Tools/Properties/AssemblyInfo.cs
#	Demo/Examples/Compdfkit_Tools/Strings/PropertyPanel.resx
#	Demo/Examples/Compdfkit_Tools/Strings/PropertyPanel.zh.resx
#	Demo/Examples/Compdfkit_Tools/packages.config
#	Demo/Examples/ContentEditor/App.xaml.cs
#	Demo/Examples/ContentEditor/ContentEditor.csproj
#	Demo/Examples/ContentEditor/MainWindow.xaml.cs
#	Demo/Examples/ContentEditor/Properties/AssemblyInfo.cs
#	Demo/Examples/ContentEditor/packages.config
#	Demo/Examples/DigitalSignature/App.xaml.cs
#	Demo/Examples/DigitalSignature/DigitalSignature.csproj
#	Demo/Examples/DigitalSignature/MainWindow.xaml.cs
#	Demo/Examples/DigitalSignature/Properties/AssemblyInfo.cs
#	Demo/Examples/DigitalSignature/packages.config
#	Demo/Examples/DocsEditor/App.xaml.cs
#	Demo/Examples/DocsEditor/DocsEditor.csproj
#	Demo/Examples/DocsEditor/MainWindow.xaml.cs
#	Demo/Examples/DocsEditor/Properties/AssemblyInfo.cs
#	Demo/Examples/DocsEditor/packages.config
#	Demo/Examples/Examlpes.sln
#	Demo/Examples/Forms/App.xaml.cs
#	Demo/Examples/Forms/Forms.csproj
#	Demo/Examples/Forms/MainWindow.xaml.cs
#	Demo/Examples/Forms/Properties/AssemblyInfo.cs
#	Demo/Examples/Forms/packages.config
#	Demo/Examples/Measure/App.xaml.cs
#	Demo/Examples/Measure/Measure.csproj
#	Demo/Examples/PDFViewer/App.xaml.cs
#	Demo/Examples/PDFViewer/MainPage.xaml
#	Demo/Examples/PDFViewer/MainPage.xaml.cs
#	Demo/Examples/PDFViewer/MainWindow.xaml.cs
#	Demo/Examples/PDFViewer/PDFViewer.csproj
#	Demo/Examples/PDFViewer/Properties/AssemblyInfo.cs
#	Demo/Examples/PDFViewer/Properties/Settings.Designer.cs
#	Demo/Examples/PDFViewer/packages.config
#	Demo/Examples/Samples/AnnotationImportExportTest/CS/AnnotationImportExportTest.csproj
#	Demo/Examples/Samples/AnnotationImportExportTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/AnnotationImportExportTest/CS/packages.config
#	Demo/Examples/Samples/AnnotationImportExportTest/VB/AnnotationImportExportTest.vbproj
#	Demo/Examples/Samples/AnnotationImportExportTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/AnnotationImportExportTest/VB/packages.config
#	Demo/Examples/Samples/AnnotationTest/CS/AnnotationTest.csproj
#	Demo/Examples/Samples/AnnotationTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/AnnotationTest/CS/packages.config
#	Demo/Examples/Samples/AnnotationTest/VB/AnnotationTest.vbproj
#	Demo/Examples/Samples/AnnotationTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/AnnotationTest/VB/packages.config
#	Demo/Examples/Samples/BackgroundTest/CS/BackgroundTest.csproj
#	Demo/Examples/Samples/BackgroundTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/BackgroundTest/CS/packages.config
#	Demo/Examples/Samples/BackgroundTest/VB/BackgroundTest.vbproj
#	Demo/Examples/Samples/BackgroundTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/BackgroundTest/VB/packages.config
#	Demo/Examples/Samples/BatesTest/CS/BatesTest.csproj
#	Demo/Examples/Samples/BatesTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/BatesTest/CS/packages.config
#	Demo/Examples/Samples/BatesTest/VB/BatesTest.vbproj
#	Demo/Examples/Samples/BatesTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/BatesTest/VB/packages.config
#	Demo/Examples/Samples/BookmarkTest/CS/BookmarkTest.csproj
#	Demo/Examples/Samples/BookmarkTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/BookmarkTest/CS/packages.config
#	Demo/Examples/Samples/BookmarkTest/VB/BookmarkTest.vbproj
#	Demo/Examples/Samples/BookmarkTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/BookmarkTest/VB/packages.config
#	Demo/Examples/Samples/DigitalSignatureTest/CS/DigitalSignatureTest.csproj
#	Demo/Examples/Samples/DigitalSignatureTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/DigitalSignatureTest/CS/packages.config
#	Demo/Examples/Samples/DigitalSignatureTest/VB/DigitalSignatureTest.vbproj
#	Demo/Examples/Samples/DigitalSignatureTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/DigitalSignatureTest/VB/packages.config
#	Demo/Examples/Samples/DocumentCompare/CS/DocumentCompareTest.csproj
#	Demo/Examples/Samples/DocumentCompare/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/DocumentCompare/CS/packages.config
#	Demo/Examples/Samples/DocumentCompare/VB/DocumentCompareTest.vbproj
#	Demo/Examples/Samples/DocumentCompare/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/DocumentCompare/VB/packages.config
#	Demo/Examples/Samples/DocumentInfoTest/CS/DocumentInfoTest.csproj
#	Demo/Examples/Samples/DocumentInfoTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/DocumentInfoTest/CS/packages.config
#	Demo/Examples/Samples/DocumentInfoTest/VB/DocumentInfoTest.vbproj
#	Demo/Examples/Samples/DocumentInfoTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/DocumentInfoTest/VB/packages.config
#	Demo/Examples/Samples/EncryptTest/CS/EncryptTest.csproj
#	Demo/Examples/Samples/EncryptTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/EncryptTest/CS/packages.config
#	Demo/Examples/Samples/EncryptTest/VB/EncryptTest.vbproj
#	Demo/Examples/Samples/EncryptTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/EncryptTest/VB/packages.config
#	Demo/Examples/Samples/FlattenTest/CS/FlattenTest.csproj
#	Demo/Examples/Samples/FlattenTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/FlattenTest/CS/packages.config
#	Demo/Examples/Samples/FlattenTest/VB/FlattenTest.vbproj
#	Demo/Examples/Samples/FlattenTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/FlattenTest/VB/packages.config
#	Demo/Examples/Samples/HeaderFooterTest/CS/HeaderFooterTest.csproj
#	Demo/Examples/Samples/HeaderFooterTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/HeaderFooterTest/CS/packages.config
#	Demo/Examples/Samples/HeaderFooterTest/VB/HeaderFooterTest.vbproj
#	Demo/Examples/Samples/HeaderFooterTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/HeaderFooterTest/VB/packages.config
#	Demo/Examples/Samples/ImageExtractTest/CS/ImageExtractTest.csproj
#	Demo/Examples/Samples/ImageExtractTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/ImageExtractTest/CS/packages.config
#	Demo/Examples/Samples/ImageExtractTest/VB/ImageExtractTest.vbproj
#	Demo/Examples/Samples/ImageExtractTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/ImageExtractTest/VB/packages.config
#	Demo/Examples/Samples/InteractiveFormsTest/CS/InteractiveFormsTest.csproj
#	Demo/Examples/Samples/InteractiveFormsTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/InteractiveFormsTest/CS/packages.config
#	Demo/Examples/Samples/InteractiveFormsTest/VB/InteractiveFormsTest.vbproj
#	Demo/Examples/Samples/InteractiveFormsTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/InteractiveFormsTest/VB/packages.config
#	Demo/Examples/Samples/OutlineTest/CS/OutlineTest.csproj
#	Demo/Examples/Samples/OutlineTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/OutlineTest/CS/packages.config
#	Demo/Examples/Samples/OutlineTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/OutlineTest/VB/OutlineTest.vbproj
#	Demo/Examples/Samples/OutlineTest/VB/packages.config
#	Demo/Examples/Samples/PDFATest/CS/PDFATest.csproj
#	Demo/Examples/Samples/PDFATest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/PDFATest/CS/packages.config
#	Demo/Examples/Samples/PDFATest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/PDFATest/VB/PDFATest.vbproj
#	Demo/Examples/Samples/PDFATest/VB/packages.config
#	Demo/Examples/Samples/PDFPageTest/CS/PDFPageTest.csproj
#	Demo/Examples/Samples/PDFPageTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/PDFPageTest/CS/packages.config
#	Demo/Examples/Samples/PDFPageTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/PDFPageTest/VB/PDFPageTest.vbproj
#	Demo/Examples/Samples/PDFPageTest/VB/packages.config
#	Demo/Examples/Samples/PDFRedactTest/CS/PDFRedactTest.csproj
#	Demo/Examples/Samples/PDFRedactTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/PDFRedactTest/CS/packages.config
#	Demo/Examples/Samples/PDFRedactTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/PDFRedactTest/VB/PDFRedactTest.vbproj
#	Demo/Examples/Samples/PDFRedactTest/VB/packages.config
#	Demo/Examples/Samples/PDFToImage/CS/PDFToImageTest.csproj
#	Demo/Examples/Samples/PDFToImage/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/PDFToImage/CS/packages.config
#	Demo/Examples/Samples/PDFToImage/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/PDFToImage/VB/PDFToImageTest.vbproj
#	Demo/Examples/Samples/PDFToImage/VB/packages.config
#	Demo/Examples/Samples/TextExtractTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/TextExtractTest/CS/TextExtractTest.csproj
#	Demo/Examples/Samples/TextExtractTest/CS/packages.config
#	Demo/Examples/Samples/TextExtractTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/TextExtractTest/VB/TextExtractTest.vbproj
#	Demo/Examples/Samples/TextExtractTest/VB/packages.config
#	Demo/Examples/Samples/TextSearchTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/TextSearchTest/CS/TextSearchTest.csproj
#	Demo/Examples/Samples/TextSearchTest/CS/packages.config
#	Demo/Examples/Samples/TextSearchTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/TextSearchTest/VB/TextSearchTest.vbproj
#	Demo/Examples/Samples/TextSearchTest/VB/packages.config
#	Demo/Examples/Samples/WatermarkTest/CS/Properties/AssemblyInfo.cs
#	Demo/Examples/Samples/WatermarkTest/CS/WatermarkTest.csproj
#	Demo/Examples/Samples/WatermarkTest/CS/packages.config
#	Demo/Examples/Samples/WatermarkTest/VB/My Project/AssemblyInfo.vb
#	Demo/Examples/Samples/WatermarkTest/VB/WatermarkTest.vbproj
#	Demo/Examples/Samples/WatermarkTest/VB/packages.config
#	Demo/Examples/TestFile/ComPDFKit_Sample_File_Windows.pdf
#	Demo/Examples/Viewer/App.xaml.cs
#	Demo/Examples/Viewer/Properties/AssemblyInfo.cs
#	Demo/Examples/Viewer/Viewer.csproj
#	Demo/Examples/Viewer/packages.config
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.11.0/build/x64/ComPDFKit.dll
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.11.0/build/x86/ComPDFKit.dll
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.13.0/ComPDFKit.NetFramework.1.13.0.nupkg
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.13.0/ComPDFKit.png
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.13.0/License.txt
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.13.0/build/ComPDFKit.NetFramework.targets
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.13.0/build/PDFA/sRGB2014.icc
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.13.0/build/x64/ComPDFKit.dll
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.13.0/build/x86/ComPDFKit.dll
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.9.1/build/x64/ComPDFKit.dll
#	Demo/Examples/packages/ComPDFKit.NetFramework.1.9.1/build/x86/ComPDFKit.dll

Demo/Examples/Annotations/Annotations.csproj

@@ -41,6 +41,12 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ComPDFKit.Desk, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.1.13.0\lib\ComPDFKit.Desk.dll</HintPath>
+    </Reference>
+    <Reference Include="ComPDFKit.Viewer, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.1.13.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>
@@ -115,8 +121,8 @@
     <Resource Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\license_key_windows.txt">
-      <Link>license_key_windows.txt</Link>
+    <None Include="..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <Content Include="..\..\..\..\x64\ComPDFKit.dll">

Demo/Examples/Annotations/MainWindow.xaml

@@ -8,7 +8,7 @@
         xmlns:common="clr-namespace:Compdfkit_Tools.Common;assembly=ComPDFKit_Tools"
         mc:Ignorable="d"
         Loaded="MainWindow_Loaded"
-        Title="Annotations_ComPDFKit V1.11.0" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
+        Title="{Binding AppInfo}" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

Demo/Examples/Annotations/MainWindow.xaml.cs

@@ -20,6 +20,8 @@ using System.Windows.Input;
 using System.Windows.Media.Imaging;
 using Compdfkit_Tools.PDFView;
 using ComPDFKit.Tool;
+using System.Reflection;
+using System.Linq;
 
 namespace AnnotationViewControl
 {
@@ -86,8 +88,13 @@ namespace AnnotationViewControl
                 OnPropertyChanged();
             }
         }
+
+        public string AppInfo
+        {
+            get { return Assembly.GetExecutingAssembly().GetName().Name + " " + string.Join(".", Assembly.GetExecutingAssembly().GetName().Version.ToString().Split('.').Take(3)); }
+        }
         #endregion
-        
+
         public MainWindow()
         {
             InitializeComponent();

Demo/Examples/Annotations/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Compdfkit_Tools/Annotation/AnnotationControl/AnnotationControl.xaml.cs

@@ -18,6 +18,8 @@ using ComPDFKit.DigitalSign;
 using ComPDFKit.PDFAnnotation.Form;
 using ComPDFKit.PDFAnnotation;
 using ComPDFKit.Tool;
+using PasswordBoxPlus.Helper;
+using ComPDFKit.NativeMethod;
 
 namespace Compdfkit_Tools.PDFControl
 {
@@ -762,7 +764,7 @@ namespace Compdfkit_Tools.PDFControl
         }
 
         private void AnnotationBarControl_AnnotationPropertyChanged(object sender, CPDFAnnotationType e)
-        {
+        { 
             PDFAnnotationControl.LoadAnnotationPanel(e);
             if (e != CPDFAnnotationType.Audio && e != CPDFAnnotationType.Image)
             {

Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj

@@ -1307,4 +1307,31 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets'))" />
+  </Target>
+>>>>>>>>> Temporary merge branch 2
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets'))" />
+  </Target>
+>>>>>>>>> Temporary merge branch 2
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ComPDFKit.NetFramework.1.11.0\build\ComPDFKit.NetFramework.targets'))" />
+  </Target>
+>>>>>>>>> Temporary merge branch 2
 </Project>

Demo/Examples/Compdfkit_Tools/Edit/PDFContentEditControl.xaml.cs

@@ -30,6 +30,13 @@ namespace Compdfkit_Tools.Edit
         }
          
         public void SetPDFTextEditData(TextEditParam editEvent, bool isTemp = false)
+
+        public void SetRotationText(float rotation)
+        {
+            PDFImageEditControl.SetRotationText(rotation);
+        }
+
+        public void SetPDFTextEditData(PDFEditEvent editEvent, bool isTemp = false)
         {
             if (!isTemp)
             {

Demo/Examples/Compdfkit_Tools/Edit/PDFImageEdit/PDFImageEditControl/PDFImageEditControl.xaml.cs

@@ -49,6 +49,12 @@ namespace Compdfkit_Tools.Edit
             FlipUI.FlipChanged -= FlipUI_FlipChanged;
         }
 
+
+        public void SetRotationText(float rotation)
+        {
+            RotationTxb.Text = rotation.ToString(CultureInfo.CurrentCulture);
+        }
+
         public void InitWithPDFViewer(CPDFViewerTool newPDFView)
         {
             ToolView = newPDFView;
@@ -185,7 +191,8 @@ namespace Compdfkit_Tools.Edit
                         editHistory.PageIndex = pdfPage.PageIndex;
                     }
 
-                    ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory);
+                    ToolView.GetCPDFViewer()?.UndoManager.AddHistory(editHistory)
+                    SetRotationText(EditEvent.CurrentRotated);
                     SetImageThumb();
                     ToolView.UpdateRender(oldRect, imageArea);
                     editPage.EndEdit();

Demo/Examples/Compdfkit_Tools/Measure/MeasureInfoPanel.xaml

@@ -4,8 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Compdfkit_Tools.Measure"
+             xmlns:common="clr-namespace:Compdfkit_Tools.Common"
              mc:Ignorable="d" 
              d:DesignHeight="350" d:DesignWidth="150">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <common:PropertyPanelResourceConverter x:Key="PropertyPanelResourceConverter" />
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Border BorderBrush="LightGray" CornerRadius="4" Background="White">
         <Border.Effect>
             <DropShadowEffect BlurRadius="20" ShadowDepth="0" Color="Black" Opacity="0.4"/>
@@ -47,22 +53,22 @@
                     <RowDefinition Height="auto"></RowDefinition>
                     <RowDefinition Height="auto"></RowDefinition>
                 </Grid.RowDefinitions>
-                <TextBlock FontSize="14">Scale:</TextBlock>
+                <TextBlock FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Scale}"></TextBlock>
                 <TextBlock Name="ScaleText" Grid.Column="1" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="1" Margin="0,10,0,0" FontSize="14">Length:</TextBlock>
+                <TextBlock Grid.Row="1" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Length}"></TextBlock>
                 <TextBlock Name="DistanceText" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="2"  Margin="0,10,0,0" FontSize="14">Precision:</TextBlock>
+                <TextBlock Grid.Row="2"  Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Precision}"></TextBlock>
                 <TextBlock Name="PrecisionText" Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="3" Margin="0,10,0,0" FontSize="14">Angle:</TextBlock>
+                <TextBlock Grid.Row="3" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Angle}"></TextBlock>
                 <TextBlock Name="AngleText" Grid.Row="3" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="4" Margin="0,10,0,0" FontSize="14">X:</TextBlock>
+                <TextBlock Grid.Row="4" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_X}"></TextBlock>
                 <TextBlock Name="XText" Grid.Row="4" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="5" Margin="0,10,0,0" FontSize="14">Y:</TextBlock>
+                <TextBlock Grid.Row="5" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Y}"></TextBlock>
                 <TextBlock Name="YText" Grid.Row="5" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
             </Grid>
@@ -78,16 +84,16 @@
                     <RowDefinition Height="auto"></RowDefinition>
                     <RowDefinition Height="auto"></RowDefinition>
                 </Grid.RowDefinitions>
-                <TextBlock FontSize="14">Scale:</TextBlock>
+                <TextBlock FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Scale}"></TextBlock>
                 <TextBlock Name="ScalePolyLineText" Grid.Column="1" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="1" Margin="0,10,0,0" FontSize="14">Length:</TextBlock>
+                <TextBlock Grid.Row="1" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Length}"></TextBlock>
                 <TextBlock Name="DistancePolyLineText" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="2"  Margin="0,10,0,0" FontSize="14">Precision:</TextBlock>
+                <TextBlock Grid.Row="2"  Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Precision}"></TextBlock>
                 <TextBlock Name="PrecisionPolyLineText" Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="3" Margin="0,10,0,0" FontSize="14">Angle:</TextBlock>
+                <TextBlock Grid.Row="3" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Angle}"></TextBlock>
                 <TextBlock Name="AnglePolyLineText" Grid.Row="3" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
             </Grid>
@@ -103,23 +109,23 @@
                     <RowDefinition Height="auto"></RowDefinition>
                     <RowDefinition Height="auto"></RowDefinition>
                 </Grid.RowDefinitions>
-                <TextBlock FontSize="14">Scale:</TextBlock>
+                <TextBlock FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Scale}"></TextBlock>
                 <TextBlock Name="ScalePolygonText" Grid.Column="1" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="1" Margin="0,10,0,0" FontSize="14">Area:</TextBlock>
+                <TextBlock Grid.Row="1" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Area}"></TextBlock>
                 <TextBlock Name="RoundPolygonText" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="2"  Margin="0,10,0,0" FontSize="14">Precision:</TextBlock>
+                <TextBlock Grid.Row="2"  Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Precision}"></TextBlock>
                 <TextBlock Name="PrecisionPolygonText" Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
-                <TextBlock Grid.Row="3" Margin="0,10,0,0" FontSize="14">Angle:</TextBlock>
+                <TextBlock Grid.Row="3" Margin="0,10,0,0" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Angle}"></TextBlock>
                 <TextBlock Name="AnglePolygonText" Grid.Row="3" Grid.Column="1" Margin="0,10,0,0" FontSize="14"></TextBlock>
 
             </Grid>
 
             <TextBlock Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" 
                        Margin="0,10,40,20" FontSize="14" Foreground="Blue" Cursor="Hand"
-                       MouseLeftButtonDown="TextBlock_MouseLeftButtonDown">Settings</TextBlock>
+                       MouseLeftButtonDown="TextBlock_MouseLeftButtonDown" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Settings}"></TextBlock>
 
         </Grid>
     </Border>

Demo/Examples/Compdfkit_Tools/Measure/MeasureInfoPanel.xaml.cs

@@ -15,6 +15,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Compdfkit_Tools.Helper;
 
 namespace Compdfkit_Tools.Measure
 {
@@ -29,7 +30,7 @@ namespace Compdfkit_Tools.Measure
         internal Dictionary<string, string> IconsDict { get; private set; } = new Dictionary<string, string>()
         {
             {
-                "Distance Measurement",
+                LanguageHelper.ToolBarManager.GetString("Button_Line") ?? string.Empty,
                 "M17.7782 5.75646L14.2427 2.22093L13.0052 3.45837L15.4802 5.93333L14.4195 6.99399L11.9446 4.51903L10.1768 " +
                 "6.28679L12.6518 8.76175L11.5911 9.82241L9.11615 7.34745L7.34838 9.11522L9.82334 11.5902L8.76268 " +
                 "12.6508L6.28772 10.1759L4.51996 11.9436L6.99492 14.4186L5.93426 15.4793L3.4593 13.0043L2.22186 " +
@@ -38,7 +39,7 @@ namespace Compdfkit_Tools.Measure
                 "6.81712L19.8995 5.75646L18.8389 4.6958L15.3033 1.16027Z"
             },
             {
-                "Multiline",
+                LanguageHelper.ToolBarManager.GetString("Button_Multiline") ?? string.Empty,
                 "M0.5 3C0.5 1.89543 1.39543 1 2.5 1C3.33934 1 4.05793 1.51704 4.35462 2.25H15.6454C15.9421 1.51704 16.6607 1 " +
                 "17.5 1C18.6046 1 19.5 1.89543 19.5 3C19.5 3.83934 18.983 4.55793 18.25 4.85462V17V17.75H17.5H13.7011L14.5167 " +
                 "18.5765L13.5138 19.5928L11.4986 17.5505L10.9972 17.0423L11.4986 16.5342L13.5138 14.4918L14.5167 15.5082L13.7847 " +
@@ -46,8 +47,12 @@ namespace Compdfkit_Tools.Measure
                 "4.85462V16.25H6.25V15H7.75V19H6.25V17.75H2.5H1.75V17V4.85462C1.01704 4.55793 0.5 3.83934 0.5 3Z"
             },
             {
-                "Polygonal",
+                LanguageHelper.ToolBarManager.GetString("Button_Polygonal") ?? string.Empty,
                 "M1.37111 7.6963L10 1.42705L18.6289 7.6963L15.3329 17.8402H4.66705L1.37111 7.6963Z"
+            },
+            {
+                LanguageHelper.ToolBarManager.GetString("Button_Rectangle") ?? string.Empty,
+                "M20.25 2.25H0.75V17.75H20.25V2.25ZM18.75 10.75V16.25H2.25V10.75H18.75ZM18.75 9.25V3.75H2.25V9.25H18.75ZM6.5 5.5H3.5V7.5H6.5V5.5ZM3.5 12.5H6.5V14.5H3.5V12.5Z"
             }
 
         };

Demo/Examples/Compdfkit_Tools/Measure/MeasurePropertyControl.xaml

@@ -4,10 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Compdfkit_Tools.Measure"
+             xmlns:common="clr-namespace:Compdfkit_Tools.Common"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800" Background="#FAFCFF">
     <Grid>
-        <TextBlock Name="NoResultText" Foreground="#43474D" FontSize="14" LineHeight="16" TextWrapping="Wrap" Width="190" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center">The property panel is empty</TextBlock>
+        <Grid.Resources>
+            <common:PropertyPanelResourceConverter x:Key="PropertyPanelResourceConverter" />
+        </Grid.Resources>
+        <TextBlock Name="NoResultText" Foreground="#43474D" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Text_EmptyPanel}" FontSize="14" LineHeight="16" TextWrapping="Wrap" Width="190" TextAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"></TextBlock>
         <Border x:Name="MeasurePropertyPanel"></Border>
     </Grid>
 </UserControl>

Demo/Examples/Compdfkit_Tools/Measure/MeasureSettingPanel.xaml

@@ -4,8 +4,12 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Compdfkit_Tools.Measure"
+             xmlns:common="clr-namespace:Compdfkit_Tools.Common"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
+    <UserControl.Resources>
+        <common:PropertyPanelResourceConverter x:Key="PropertyPanelResourceConverter" />
+    </UserControl.Resources>
     <Border x:Name="SettingPanel" BorderBrush="LightGray" CornerRadius="4" Background="White" Width="530" Height="350">
         <Border.Effect>
             <DropShadowEffect BlurRadius="20" ShadowDepth="0" Color="Black" Opacity="0.4"/>
@@ -19,7 +23,7 @@
                 <RowDefinition Height="auto"></RowDefinition>
                 <RowDefinition Height="auto"></RowDefinition>
             </Grid.RowDefinitions>
-            <TextBlock FontSize="16">Settings</TextBlock>
+            <TextBlock FontSize="16" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Title_Settings}"></TextBlock>
 
             <Grid Grid.Row="1" Margin="0,20,0,0">
                 <Grid.RowDefinitions>
@@ -29,8 +33,8 @@
                     <RowDefinition Height="auto"></RowDefinition>
                     <RowDefinition Height="auto"></RowDefinition>
                 </Grid.RowDefinitions>
-                <TextBlock FontSize="14" FontWeight="Bold">Custom Scale</TextBlock>
-                <TextBlock FontSize="14" Grid.Row="1" Margin="0,10,0,10">Drawing dimensions: Actual size</TextBlock>
+                <TextBlock FontSize="14" FontWeight="Bold" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Title_Scale}"></TextBlock>
+                <TextBlock FontSize="14" Grid.Row="1" Margin="0,10,0,10" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Text_Dimensions}"></TextBlock>
                 <StackPanel Grid.Row="2" Orientation="Horizontal">
                     <TextBox Name="RulerBaseText" Width="110"  VerticalContentAlignment="Center" FontSize="14"
                              InputMethod.IsInputMethodEnabled="False"
@@ -39,9 +43,9 @@
                         
                     </TextBox>
                     <ComboBox Name="RulerBaseUnitCombo" Width="110" FontSize="14" Margin="10,0,0,0" VerticalContentAlignment="Center">
-                        <ComboBoxItem>in</ComboBoxItem>
-                        <ComboBoxItem IsSelected="True">cm</ComboBoxItem>
-                        <ComboBoxItem>mm</ComboBoxItem>
+                        <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_IN}"></ComboBoxItem>
+                        <ComboBoxItem IsSelected="True" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_CM}"></ComboBoxItem>
+                        <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_MM}"></ComboBoxItem>
                     </ComboBox>
                     <TextBlock FontSize="14" Margin="10,0,10,0">=</TextBlock>
                     <TextBox Name="RulerTranslateText" Width="110" FontSize="14" VerticalContentAlignment="Center"
@@ -51,19 +55,18 @@
 
                     </TextBox>
                     <ComboBox Name="RulerTranslateCombo" Width="110" FontSize="14" Margin="10,0,0,0" VerticalContentAlignment="Center">
-                        <ComboBoxItem>pt</ComboBoxItem>
-                        <ComboBoxItem IsSelected="True">cm</ComboBoxItem>
-                        <ComboBoxItem>in</ComboBoxItem>
-                        <ComboBoxItem>mm</ComboBoxItem>
-                        <ComboBoxItem>m</ComboBoxItem>
-                        <ComboBoxItem>km</ComboBoxItem>
-                        <ComboBoxItem>ft</ComboBoxItem>
-                        <ComboBoxItem>yd</ComboBoxItem>
-                        <ComboBoxItem>mi</ComboBoxItem>
+                        <ComboBoxItem Tag="pt" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_PT}"></ComboBoxItem>
+                        <ComboBoxItem Tag="cm" IsSelected="True" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_CM}"></ComboBoxItem>
+                        <ComboBoxItem Tag="in" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_IN}"></ComboBoxItem>
+                        <ComboBoxItem Tag="mm" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_MM}"></ComboBoxItem>
+                        <ComboBoxItem Tag="m" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_M}"></ComboBoxItem>
+                        <ComboBoxItem Tag="km" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_KM}"></ComboBoxItem>
+                        <ComboBoxItem Tag="yd" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_FT}"></ComboBoxItem>
+                        <ComboBoxItem Tag="mi" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_YD}"></ComboBoxItem>
+                        <ComboBoxItem Tag="mi" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Scale_MI}"></ComboBoxItem>
                     </ComboBox>
                 </StackPanel>
-                <TextBlock Grid.Row="3" Margin="0,10,0,10" FontSize="14">
-                    Precision
+                <TextBlock Grid.Row="3" Margin="0,10,0,10" FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Precision}">
                 </TextBlock>
                 <ComboBox Name="PrecisionBox" Grid.Row="4" Width="110" HorizontalAlignment="Left">
                     <ComboBoxItem>1</ComboBoxItem>
@@ -83,14 +86,14 @@
                     <RowDefinition Height="auto"></RowDefinition>
                 </Grid.RowDefinitions>
 
-                <TextBlock FontSize="14" >Show Caption</TextBlock>
-                <CheckBox x:Name="LengthCheckBox" IsChecked="True" Grid.Row="1" Margin="0,10,0,10" FontSize="14">Length</CheckBox>
-                <CheckBox x:Name="AreaCheckBox" IsChecked="True" Grid.Row="2" FontSize="14">Area</CheckBox>
+                <TextBlock FontSize="14" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Title_Caption}" ></TextBlock>
+                <CheckBox x:Name="LengthCheckBox" IsChecked="True" Grid.Row="1" Margin="0,10,0,10" FontSize="14" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Length}"></CheckBox>
+                <CheckBox x:Name="AreaCheckBox" IsChecked="True" Grid.Row="2" FontSize="14" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Board_Area}"></CheckBox>
             </Grid>
 
             <StackPanel Grid.Row="4" HorizontalAlignment="Right" Orientation="Horizontal">
-                <Button Width="110" Height="32" Click="ButtonCancel_Click">Cancel</Button>
-                <Button Width="110" Height="32" Click="ButtonDone_Click" Margin="10,0,0,0">Done</Button>
+                <Button Width="110" Height="32" Click="ButtonCancel_Click" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Button_Cancel}"></Button>
+                <Button Width="110" Height="32" Click="ButtonDone_Click" Margin="10,0,0,0" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter}, ConverterParameter=Button_Done}"></Button>
             </StackPanel>
         </Grid>
     </Border>

Demo/Examples/Compdfkit_Tools/Measure/Property/MultilineProperty.xaml

@@ -10,6 +10,7 @@
              >
     <UserControl.Resources>
         <ResourceDictionary>
+            <cpdfcommon:PropertyPanelResourceConverter x:Key="PropertyPanelResourceConverter" />
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="../../Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
@@ -20,31 +21,31 @@
             <StackPanel Orientation="Vertical">
                 <Border BorderThickness="1" BorderBrush="#1A000000">
                     <Grid  Height="40" Background="White" >
-                        <TextBlock x:Name="TitleTextBlock" Text="Appearance"  HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" FontWeight="Bold" FontFamily="Segoe UI"></TextBlock>
+                        <TextBlock x:Name="TitleTextBlock" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Title_Appearance_M}"  HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" FontWeight="Bold" FontFamily="Segoe UI"></TextBlock>
                     </Grid>
                 </Border>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Line Color" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineColor}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:ColorPickerControl x:Name="BorderColorPickerControl" Margin="0,8,0,0" Brush="Red" TransparentBtnProperty ="Collapsed" ColorChanged="BorderColorPickerControl_ColorChanged"/>
                 </StackPanel>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Opacity" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Opacity_M}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:CPDFOpacityControl x:Name="CPDFOpacityControl" Margin="0,8,0,0" OpacityChanged="CPDFOpacityControl_OpacityChanged"/>
                 </StackPanel>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Line Width" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineWidth}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:CPDFThicknessControl x:Name="CPDFThicknessControl" Margin="0,8,0,0" ThicknessChanged="CPDFThicknessControl_ThicknessChanged"/>
                 </StackPanel>
                 <StackPanel x:Name="LineStyleStackPanel" Height="90" Margin="5">
-                    <TextBlock Text="Line and Border Style" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineStyle}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:CPDFLineStyleControl x:Name="CPDFLineStyleControl" Margin="0,8,0,0" LineStyleChanged="CPDFLineStyleControl_LineStyleChanged"/>
                 </StackPanel>
                 <StackPanel x:Name="FontColorStackPanel" Height="75" Margin="5">
-                    <TextBlock Text="Font Color" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_FontColor}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:ColorPickerControl Margin="0,8,0,0" x:Name="FontColorPickerControl" TransparentBtnProperty ="Collapsed" Brush="Transparent" ColorChanged="FontColorPickerControl_ColorChanged"/>
                 </StackPanel>
                 <StackPanel  Margin="5">
-                    <TextBlock  Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Text="Text" FontSize="14" FontFamily="Segoe UI" FontWeight="Bold" />
+                    <TextBlock  Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Text}" FontSize="14" FontFamily="Segoe UI" FontWeight="Bold" />
                     <ComboBox x:Name="FontCombox" Margin="0,8,0,0" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontCombox_SelectionChanged">
                         <ComboBoxItem Content="Arial"/>
                         <ComboBoxItem Content="Courier New"/>
@@ -52,16 +53,16 @@
                     </ComboBox>
                     <StackPanel Orientation="Horizontal" >
                         <ComboBox x:Name="FontStyleCombox"  Margin="0,8,0,0" Width="148" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontStyleCombox_SelectionChanged">
-                            <ComboBoxItem Content="Regular"/>
-                            <ComboBoxItem Content="Bold"/>
-                            <ComboBoxItem Content="Italic"/>
-                            <ComboBoxItem Content="Bold Italic"/>
+                            <ComboBoxItem IsSelected="True" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Regular}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Bold}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Oblique}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_BoldOblique}"/>
                         </ComboBox>
                         <ComboBox x:Name="FontSizeComboBox" Margin="4,8,0,0" Width="72" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontSizeCombox_SelectionChanged"/>
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Height="160" Margin="5">
-                    <TextBlock Text="Note"></TextBlock>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Note}"></TextBlock>
                     <TextBox Height="100"  x:Name="NoteTextBox"  TextChanged="NoteTextBox_TextChanged" TextWrapping="Wrap" AcceptsReturn="True"></TextBox>
                 </StackPanel>
             </StackPanel>

Demo/Examples/Compdfkit_Tools/Measure/Property/PolygonalProperty.xaml

@@ -10,6 +10,7 @@
              >
     <UserControl.Resources>
         <ResourceDictionary>
+            <cpdfcommon:PropertyPanelResourceConverter x:Key="PropertyPanelResourceConverter" />
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="../../Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
@@ -20,31 +21,31 @@
             <StackPanel Orientation="Vertical">
                 <Border BorderThickness="1" BorderBrush="#1A000000">
                     <Grid  Height="40" Background="White" >
-                        <TextBlock x:Name="TitleTextBlock" Text="Appearance"  HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"  FontWeight="Bold" FontFamily="Segoe UI"></TextBlock>
+                        <TextBlock x:Name="TitleTextBlock" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Title_Appearance_M}"  HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16"  FontWeight="Bold" FontFamily="Segoe UI"></TextBlock>
                     </Grid>
                 </Border>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Fill Color"  FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_FillColor}"  FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:ColorPickerControl x:Name="FillColorPickerControl" Margin="0,8,0,0" Brush="Red" ColorChanged="FillColorPickerControl_ColorChanged"/>
                 </StackPanel>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Line Color" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineColor}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:ColorPickerControl x:Name="BorderColorPickerControl" Margin="0,8,0,0" Brush="Red" TransparentBtnProperty ="Collapsed" ColorChanged="BorderColorPickerControl_ColorChanged"/>
                 </StackPanel>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Opacity" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Opacity_M}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:CPDFOpacityControl x:Name="CPDFOpacityControl" Margin="0,8,0,0" OpacityChanged="CPDFOpacityControl_OpacityChanged"/>
                 </StackPanel>
                 <StackPanel x:Name="LineStyleStackPanel" Height="90" Margin="5">
-                    <TextBlock Text="Line and Border Style"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineStyle}"/>
                     <cpdfcommon:CPDFLineStyleControl x:Name="CPDFLineStyleControl" Margin="0,8,0,0" LineStyleChanged="CPDFLineStyleControl_LineStyleChanged"/>
                 </StackPanel>
                 <StackPanel x:Name="FontColorStackPanel" Height="75" Margin="5">
-                    <TextBlock Text="Font Color" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_FontColor}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:ColorPickerControl x:Name="FontColorPickerControl" TransparentBtnProperty ="Collapsed" Brush="Transparent" Margin="0,8,0,0" ColorChanged="FontColorPickerControl_ColorChanged"/>
                 </StackPanel>
                 <StackPanel>
-                    <TextBlock  Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Text="Text" FontSize="14" FontFamily="Segoe UI" FontWeight="Bold" />
+                    <TextBlock  Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Text}" FontSize="14" FontFamily="Segoe UI" FontWeight="Bold" />
                     <ComboBox x:Name="FontCombox" Margin="0,8,0,0" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontCombox_SelectionChanged">
                         <ComboBoxItem Content="Arial"/>
                         <ComboBoxItem Content="Courier New"/>
@@ -52,16 +53,16 @@
                     </ComboBox>
                     <StackPanel Orientation="Horizontal" >
                         <ComboBox x:Name="FontStyleCombox"  Margin="0,8,0,0" Width="148" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontStyleCombox_SelectionChanged">
-                            <ComboBoxItem Content="Regular"/>
-                            <ComboBoxItem Content="Bold"/>
-                            <ComboBoxItem Content="Italic"/>
-                            <ComboBoxItem Content="Bold Italic"/>
+                            <ComboBoxItem IsSelected="True" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Regular}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Bold}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Oblique}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_BoldOblique}"/>
                         </ComboBox>
                         <ComboBox x:Name="FontSizeComboBox" Margin="4,8,0,0" Width="72" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontSizeCombox_SelectionChanged"/>
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Height="160" Margin="5">
-                    <TextBlock Text="Note"></TextBlock>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Note}"></TextBlock>
                     <TextBox Height="100"  x:Name="NoteTextBox"  TextChanged="NoteTextBox_TextChanged" TextWrapping="Wrap" AcceptsReturn="True"></TextBox>
                 </StackPanel>
             </StackPanel>

Demo/Examples/Compdfkit_Tools/Measure/Property/StraightnessProperty.xaml

@@ -12,6 +12,7 @@
              >
     <UserControl.Resources>
         <ResourceDictionary>
+            <cpdfcommon:PropertyPanelResourceConverter x:Key="PropertyPanelResourceConverter" />
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="../../Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
@@ -22,43 +23,45 @@
             <StackPanel Orientation="Vertical">
                 <Border BorderThickness="1" BorderBrush="#1A000000">
                     <Grid  Height="40" Background="White" >
-                        <TextBlock x:Name="TitleTextBlock" Text="Appearance"  HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" FontWeight="Bold" FontFamily="Segoe UI"></TextBlock>
+                        <TextBlock x:Name="TitleTextBlock" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Title_Appearance_M}"  HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" FontWeight="Bold" FontFamily="Segoe UI"></TextBlock>
                     </Grid>
                 </Border>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Line Color" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineColor}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:ColorPickerControl Margin="0,8,0,0" x:Name="BorderColorPickerControl" Brush="Red" TransparentBtnProperty ="Collapsed"
                                                    ColorChanged="BorderColorPickerControl_ColorChanged"/>
                 </StackPanel>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Opacity" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Opacity_M}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:CPDFOpacityControl Margin="0,8,0,0" x:Name="CPDFOpacityControl" OpacityChanged="CPDFOpacityControl_OpacityChanged">
                     </cpdfcommon:CPDFOpacityControl>
                 </StackPanel>
                 <StackPanel Height="68" Margin="5">
-                    <TextBlock Text="Line Width" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"></TextBlock>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineWidth}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"></TextBlock>
                     <cpdfcommon:CPDFThicknessControl Margin="0,8,0,0" x:Name="CPDFThicknessControl" 
                                                      ThicknessChanged="CPDFThicknessControl_ThicknessChanged">
                     </cpdfcommon:CPDFThicknessControl>
                 </StackPanel>
-                <StackPanel x:Name="LineStyleStackPanel" Height="90" Margin="5">
-                    <TextBlock Text="Line and Border Style" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
-                    <cpdfcommon:CPDFLineStyleControl Margin="0,8,0,0" x:Name="CPDFLineStyleControl" 
-                                                     LineStyleChanged="CPDFLineStyleControl_LineStyleChanged">
-                    </cpdfcommon:CPDFLineStyleControl>
+                <StackPanel x:Name="LineStyleStackPanel" Height="120" Margin="5">
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_LineStyle}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <cpdfcommon:CPDFLineStyleControl Margin="0,0,0,10" x:Name="CPDFLineStyleControl" LineStyleChanged="CPDFLineStyleControl_LineStyleChanged"/>
                 </StackPanel>
                 <StackPanel x:Name="ArrowStackPanel" Visibility="Visible" Height="75"  Margin="5">
-                    <TextBlock Text="Start and End" Margin="0,0,0,10" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+                        <TextBlock FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Start}"></TextBlock>
+                        <TextBlock FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI" Text="&amp;" Margin="2,0,2,0"></TextBlock>
+                        <TextBlock FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_End}"></TextBlock>
+                    </StackPanel>
                     <cpdfcommon:CPDFArrowControl x:Name="CPDFArrowControl" ArrowChanged="CPDFArrowControl_ArrowChanged">
                     </cpdfcommon:CPDFArrowControl>
                 </StackPanel>
                 <StackPanel x:Name="FontColorStackPanel" Height="75" Margin="5">
-                    <TextBlock Text="Font Color" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_FontColor}" FontWeight="SemiBold" FontSize="14" LineHeight="16"  FontFamily="Segoe UI"/>
                     <cpdfcommon:ColorPickerControl Margin="0,8,0,0" x:Name="FontColorPickerControl" Brush="Transparent" TransparentBtnProperty ="Collapsed"
                                                    ColorChanged="FontColorPickerControl_ColorChanged"></cpdfcommon:ColorPickerControl>
                 </StackPanel>
                 <StackPanel Margin="5">
-                    <TextBlock  Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Text="Text" FontSize="14" FontFamily="Segoe UI" FontWeight="Bold" />
+                    <TextBlock  Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Text}" FontSize="14" FontFamily="Segoe UI" FontWeight="Bold" />
                     <ComboBox x:Name="FontCombox" Margin="0,8,0,0" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontCombox_SelectionChanged">
                         <ComboBoxItem Content="Arial"/>
                         <ComboBoxItem Content="Courier New"/>
@@ -66,10 +69,10 @@
                     </ComboBox>
                     <StackPanel Orientation="Horizontal"  >
                         <ComboBox x:Name="FontStyleCombox"  Margin="0,8,0,0" Width="148" Style="{StaticResource ComboBoxStyle1}" SelectedIndex="0" SelectionChanged="FontStyleCombox_SelectionChanged">
-                            <ComboBoxItem Content="Regular"/>
-                            <ComboBoxItem Content="Bold"/>
-                            <ComboBoxItem Content="Italic"/>
-                            <ComboBoxItem Content="Bold Italic"/>
+                            <ComboBoxItem IsSelected="True" Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Regular}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Bold}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_Oblique}"/>
+                            <ComboBoxItem Content="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Font_BoldOblique}"/>
                         </ComboBox>
                         <Grid Grid.Row="1" Grid.Column="1" Margin="8,8,0,0">
                             <ComboBox Name="FontSizeComboBox" Width="72" Height="28" BorderThickness="1" MaxDropDownHeight="200" Foreground="#43474D" FontSize="14"
@@ -78,7 +81,7 @@
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Height="160" Margin="5">
-                    <TextBlock Text="Note"></TextBlock>
+                    <TextBlock Text="{Binding Converter={StaticResource PropertyPanelResourceConverter},ConverterParameter=Property_Note}"></TextBlock>
                     <TextBox Height="100"  x:Name="NoteTextBox"  TextChanged="NoteTextBox_TextChanged" TextWrapping="Wrap" AcceptsReturn="True"></TextBox>
                 </StackPanel>
             </StackPanel>

Demo/Examples/Compdfkit_Tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsUI/CPDFViewModeUI.xaml

@@ -183,7 +183,7 @@
                         <ToggleButton Name="ContinuePageBtn" Style="{StaticResource ToggleButtonSwitchStyle}" Margin="0,0,33,0" Grid.Column="1" Width="40" BorderThickness="0"
                                   Click="ContinuePageBtn_Click"></ToggleButton>
                     </Grid>
-                    <Grid Grid.Row="1" x:Name="CropContainer" Visibility="Collapsed">
+                    <Grid Grid.Row="1" x:Name="CropContainer" Visibility="Visible">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*"></ColumnDefinition>
                             <ColumnDefinition Width="auto"></ColumnDefinition>

Demo/Examples/Compdfkit_Tools/PDFView/PDFSearch/PDFSearchUI/CPDFSearchInputUI.xaml.cs

@@ -111,6 +111,21 @@ namespace Compdfkit_Tools.PDFControlUI
             MoveResultEvent?.Invoke(this,MoveDirection.Next);
         }
 
+        private void ReplaceTextClear_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            ReplaceTextBox.Text = string.Empty;
+        }
+
+        private void Previous_Click(object sender, RoutedEventArgs e)
+        {
+            MoveResultEvent?.Invoke(this,MoveDirection.Previous);
+        }
+
+        private void Next_Click(object sender, RoutedEventArgs e)
+        {
+            MoveResultEvent?.Invoke(this,MoveDirection.Next);
+        }
+
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (string.IsNullOrEmpty(SearchKeyWord))

Demo/Examples/Compdfkit_Tools/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Compdfkit_Tools/Strings/Common.resx

@@ -442,7 +442,7 @@
     <value>Reset Forms</value>
   </data>
   <data name="Menu_MatchPaste" xml:space="preserve">
-    <value>Keep Source Formatting Paste</value>
+    <value>Paste Without Style</value>
   </data>
   <data name="Menu_RotateLeft" xml:space="preserve">
     <value>Rotate Left</value>

Demo/Examples/Compdfkit_Tools/Strings/Common.zh.resx

@@ -442,7 +442,7 @@
     <value>重置表单</value>
   </data>
   <data name="Menu_MatchPaste" xml:space="preserve">
-    <value>带样式粘贴</value>
+    <value>不带样式粘贴</value>
   </data>
   <data name="Menu_RotateLeft" xml:space="preserve">
     <value>左旋转</value>

Demo/Examples/Compdfkit_Tools/Strings/PropertyPanel.Designer.cs

@@ -113,6 +113,78 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Angle.
+        /// </summary>
+        internal static string Board_Angle {
+            get {
+                return ResourceManager.GetString("Board_Angle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Area.
+        /// </summary>
+        internal static string Board_Area {
+            get {
+                return ResourceManager.GetString("Board_Area", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Length.
+        /// </summary>
+        internal static string Board_Length {
+            get {
+                return ResourceManager.GetString("Board_Length", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Precision.
+        /// </summary>
+        internal static string Board_Precision {
+            get {
+                return ResourceManager.GetString("Board_Precision", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scale.
+        /// </summary>
+        internal static string Board_Scale {
+            get {
+                return ResourceManager.GetString("Board_Scale", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        internal static string Board_Settings {
+            get {
+                return ResourceManager.GetString("Board_Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to X.
+        /// </summary>
+        internal static string Board_X {
+            get {
+                return ResourceManager.GetString("Board_X", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Y.
+        /// </summary>
+        internal static string Board_Y {
+            get {
+                return ResourceManager.GetString("Board_Y", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Select Action.
         /// </summary>
@@ -149,6 +221,15 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Done.
+        /// </summary>
+        internal static string Button_Done {
+            get {
+                return ResourceManager.GetString("Button_Done", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Image.
         /// </summary>
@@ -644,6 +725,15 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Line Color.
+        /// </summary>
+        internal static string Property_LineColor {
+            get {
+                return ResourceManager.GetString("Property_LineColor", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Line and Border Style.
         /// </summary>
@@ -698,6 +788,15 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Line Opacity.
+        /// </summary>
+        internal static string Property_Opacity_M {
+            get {
+                return ResourceManager.GetString("Property_Opacity_M", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Rotate.
         /// </summary>
@@ -806,6 +905,87 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to cm.
+        /// </summary>
+        internal static string Scale_CM {
+            get {
+                return ResourceManager.GetString("Scale_CM", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to ft.
+        /// </summary>
+        internal static string Scale_FT {
+            get {
+                return ResourceManager.GetString("Scale_FT", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to in.
+        /// </summary>
+        internal static string Scale_IN {
+            get {
+                return ResourceManager.GetString("Scale_IN", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to km.
+        /// </summary>
+        internal static string Scale_KM {
+            get {
+                return ResourceManager.GetString("Scale_KM", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to m.
+        /// </summary>
+        internal static string Scale_M {
+            get {
+                return ResourceManager.GetString("Scale_M", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to mi.
+        /// </summary>
+        internal static string Scale_MI {
+            get {
+                return ResourceManager.GetString("Scale_MI", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to mm.
+        /// </summary>
+        internal static string Scale_MM {
+            get {
+                return ResourceManager.GetString("Scale_MM", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to pt.
+        /// </summary>
+        internal static string Scale_PT {
+            get {
+                return ResourceManager.GetString("Scale_PT", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to yd.
+        /// </summary>
+        internal static string Scale_YD {
+            get {
+                return ResourceManager.GetString("Scale_YD", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Font.
         /// </summary>
@@ -941,6 +1121,15 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Drawing dimensions: Actual size.
+        /// </summary>
+        internal static string Text_Dimensions {
+            get {
+                return ResourceManager.GetString("Text_Dimensions", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Drop Image here or.
         /// </summary>
@@ -995,6 +1184,15 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Appearance.
+        /// </summary>
+        internal static string Title_Appearance_M {
+            get {
+                return ResourceManager.GetString("Title_Appearance_M", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Arrow.
         /// </summary>
@@ -1022,6 +1220,15 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show Caption.
+        /// </summary>
+        internal static string Title_Caption {
+            get {
+                return ResourceManager.GetString("Title_Caption", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Check Box.
         /// </summary>
@@ -1166,6 +1373,24 @@ namespace Compdfkit_Tools.Strings {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Scale.
+        /// </summary>
+        internal static string Title_Scale {
+            get {
+                return ResourceManager.GetString("Title_Scale", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        internal static string Title_Settings {
+            get {
+                return ResourceManager.GetString("Title_Settings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Signatures.
         /// </summary>
@@ -1255,5 +1480,14 @@ namespace Compdfkit_Tools.Strings {
                 return ResourceManager.GetString("Warn_SingleRdo", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Scale is not greater than zero..
+        /// </summary>
+        internal static string Warn_WrongScale {
+            get {
+                return ResourceManager.GetString("Warn_WrongScale", resourceCulture);
+            }
+        }
     }
 }

Demo/Examples/Compdfkit_Tools/Strings/PropertyPanel.resx

@@ -516,4 +516,82 @@
   <data name="Holder_Rotation" xml:space="preserve">
     <value>- 180° to 180°</value>
   </data>
+  <data name="Title_Appearance_M" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="Property_LineColor" xml:space="preserve">
+    <value>Line Color</value>
+  </data>
+  <data name="Property_Opacity_M" xml:space="preserve">
+    <value>Line Opacity</value>
+  </data>
+  <data name="Board_Scale" xml:space="preserve">
+    <value>Scale</value>
+  </data>
+  <data name="Board_Length" xml:space="preserve">
+    <value>Length</value>
+  </data>
+  <data name="Board_Precision" xml:space="preserve">
+    <value>Precision</value>
+  </data>
+  <data name="Board_X" xml:space="preserve">
+    <value>X</value>
+  </data>
+  <data name="Board_Y" xml:space="preserve">
+    <value>Y</value>
+  </data>
+  <data name="Board_Angle" xml:space="preserve">
+    <value>Angle</value>
+  </data>
+  <data name="Board_Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Scale_PT" xml:space="preserve">
+    <value>pt</value>
+  </data>
+  <data name="Scale_IN" xml:space="preserve">
+    <value>in</value>
+  </data>
+  <data name="Scale_MM" xml:space="preserve">
+    <value>mm</value>
+  </data>
+  <data name="Scale_CM" xml:space="preserve">
+    <value>cm</value>
+  </data>
+  <data name="Scale_M" xml:space="preserve">
+    <value>m</value>
+  </data>
+  <data name="Scale_KM" xml:space="preserve">
+    <value>km</value>
+  </data>
+  <data name="Scale_FT" xml:space="preserve">
+    <value>ft</value>
+  </data>
+  <data name="Scale_YD" xml:space="preserve">
+    <value>yd</value>
+  </data>
+  <data name="Scale_MI" xml:space="preserve">
+    <value>mi</value>
+  </data>
+  <data name="Warn_WrongScale" xml:space="preserve">
+    <value>Scale is not greater than zero.</value>
+  </data>
+  <data name="Board_Area" xml:space="preserve">
+    <value>Area</value>
+  </data>
+  <data name="Text_Dimensions" xml:space="preserve">
+    <value>Drawing dimensions: Actual size</value>
+  </data>
+  <data name="Title_Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Title_Scale" xml:space="preserve">
+    <value>Scale</value>
+  </data>
+  <data name="Button_Done" xml:space="preserve">
+    <value>Done</value>
+  </data>
+  <data name="Title_Caption" xml:space="preserve">
+    <value>Show Caption</value>
+  </data>
 </root>

Demo/Examples/Compdfkit_Tools/Strings/PropertyPanel.zh.resx

@@ -516,4 +516,82 @@
   <data name="Holder_Rotation" xml:space="preserve">
     <value>-180 ~ 180 度</value>
   </data>
+  <data name="Title_Appearance_M" xml:space="preserve">
+    <value>标注外观设置</value>
+  </data>
+  <data name="Property_LineColor" xml:space="preserve">
+    <value>线条颜色</value>
+  </data>
+  <data name="Property_Opacity_M" xml:space="preserve">
+    <value>线条不透明度</value>
+  </data>
+  <data name="Board_Scale" xml:space="preserve">
+    <value>比例</value>
+  </data>
+  <data name="Board_Length" xml:space="preserve">
+    <value>长度</value>
+  </data>
+  <data name="Board_Precision" xml:space="preserve">
+    <value>精度</value>
+  </data>
+  <data name="Board_X" xml:space="preserve">
+    <value>X</value>
+  </data>
+  <data name="Board_Y" xml:space="preserve">
+    <value>Y</value>
+  </data>
+  <data name="Board_Angle" xml:space="preserve">
+    <value>角度</value>
+  </data>
+  <data name="Board_Settings" xml:space="preserve">
+    <value>设置</value>
+  </data>
+  <data name="Scale_PT" xml:space="preserve">
+    <value>点</value>
+  </data>
+  <data name="Scale_CM" xml:space="preserve">
+    <value>厘米</value>
+  </data>
+  <data name="Scale_FT" xml:space="preserve">
+    <value>英尺</value>
+  </data>
+  <data name="Scale_IN" xml:space="preserve">
+    <value>英寸</value>
+  </data>
+  <data name="Scale_KM" xml:space="preserve">
+    <value>千米</value>
+  </data>
+  <data name="Scale_M" xml:space="preserve">
+    <value>米</value>
+  </data>
+  <data name="Scale_MI" xml:space="preserve">
+    <value>英里</value>
+  </data>
+  <data name="Scale_MM" xml:space="preserve">
+    <value>毫米</value>
+  </data>
+  <data name="Scale_YD" xml:space="preserve">
+    <value>码</value>
+  </data>
+  <data name="Warn_WrongScale" xml:space="preserve">
+    <value>比例尺不能小于0。</value>
+  </data>
+  <data name="Board_Area" xml:space="preserve">
+    <value>面积</value>
+  </data>
+  <data name="Text_Dimensions" xml:space="preserve">
+    <value>图纸尺寸 : 真实尺寸</value>
+  </data>
+  <data name="Title_Settings" xml:space="preserve">
+    <value>测量设置</value>
+  </data>
+  <data name="Title_Scale" xml:space="preserve">
+    <value>测量比例</value>
+  </data>
+  <data name="Button_Done" xml:space="preserve">
+    <value>完成</value>
+  </data>
+  <data name="Title_Caption" xml:space="preserve">
+    <value>文字展示</value>
+  </data>
 </root>

Demo/Examples/Compdfkit_Tools/Strings/ToolBar.Designer.cs

@@ -131,6 +131,15 @@ namespace Compdfkit_Tools.Strings.Common {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to LIne.
+        /// </summary>
+        internal static string Button_Line {
+            get {
+                return ResourceManager.GetString("Button_Line", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to List Box.
         /// </summary>
@@ -149,6 +158,15 @@ namespace Compdfkit_Tools.Strings.Common {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Multiline.
+        /// </summary>
+        internal static string Button_Multiline {
+            get {
+                return ResourceManager.GetString("Button_Multiline", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Add a Signature Field.
         /// </summary>
@@ -167,6 +185,15 @@ namespace Compdfkit_Tools.Strings.Common {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Polygon.
+        /// </summary>
+        internal static string Button_Polygonal {
+            get {
+                return ResourceManager.GetString("Button_Polygonal", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Radio Button.
         /// </summary>
@@ -176,6 +203,15 @@ namespace Compdfkit_Tools.Strings.Common {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Rectangle.
+        /// </summary>
+        internal static string Button_Rectangle {
+            get {
+                return ResourceManager.GetString("Button_Rectangle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Replace.
         /// </summary>

Demo/Examples/Compdfkit_Tools/Strings/ToolBar.resx

@@ -129,4 +129,16 @@
     <data name="Button_Delete" xml:space="preserve">
         <value>Delete</value>
     </data>
+    <data name="Button_Line" xml:space="preserve">
+        <value>LIne</value>
+    </data>
+    <data name="Button_Multiline" xml:space="preserve">
+        <value>Multiline</value>
+    </data>
+    <data name="Button_Polygonal" xml:space="preserve">
+        <value>Polygon</value>
+    </data>
+    <data name="Button_Rectangle" xml:space="preserve">
+        <value>Rectangle</value>
+    </data>
 </root>

Demo/Examples/Compdfkit_Tools/Strings/ToolBar.zh.resx

@@ -122,4 +122,16 @@
     <data name="Button_Rotate" xml:space="preserve">
         <value>旋转</value>
     </data>
+    <data name="Button_Rectangle" xml:space="preserve">
+        <value>矩形</value>
+    </data>
+    <data name="Button_Polygonal" xml:space="preserve">
+        <value>多边形</value>
+    </data>
+    <data name="Button_Multiline" xml:space="preserve">
+        <value>折线</value>
+    </data>
+    <data name="Button_Line" xml:space="preserve">
+        <value>线</value>
+    </data>
 </root>

Demo/Examples/ContentEditor/ContentEditor.csproj

@@ -131,6 +131,10 @@
       <Link>x64\ComPDFKit.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="..\TestFile\ComPDFKit_Sample_File_Windows.pdf">
       <Link>ComPDFKit_Sample_File_Windows.pdf</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Demo/Examples/ContentEditor/MainWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
         xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
-        Title="Content Editor_ComPDFKit V1.11.0" Height="450" Width="800"
+        Title="{Binding AppInfo}" Height="450" Width="800"
         Loaded="Window_Loaded">
     <Window.Resources>
         <ResourceDictionary>

Demo/Examples/ContentEditor/MainWindow.xaml.cs

@@ -81,6 +81,11 @@ namespace ContentEditorViewControl
                 OnPropertyChanged();
             }
         }
+
+        public string AppInfo
+        {
+            get { return Assembly.GetExecutingAssembly().GetName().Name + " " + string.Join(".", Assembly.GetExecutingAssembly().GetName().Version.ToString().Split('.').Take(3)); }
+        }
         #endregion
         public MainWindow()
         {

Demo/Examples/ContentEditor/Properties/AssemblyInfo.cs

@@ -22,5 +22,5 @@ using System.Windows;
     ResourceDictionaryLocation.SourceAssembly 
 )]
 
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/DigitalSignature/MainWindow.xaml

@@ -9,7 +9,7 @@
         mc:Ignorable="d"
         Loaded="Window_Loaded"
         Unloaded="Window_Unloaded"
-        Title="Digital Signature_ComPDFKit V1.11.0" Height="450" Width="800">
+        Title="{Binding AppInfo}" Height="450" Width="800">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

Demo/Examples/DigitalSignature/MainWindow.xaml.cs

@@ -105,6 +105,10 @@ namespace DigitalSignature
             }
         }
 
+        public string AppInfo
+        {
+            get { return Assembly.GetExecutingAssembly().GetName().Name + " " + string.Join(".", Assembly.GetExecutingAssembly().GetName().Version.ToString().Split('.').Take(3)); }
+        }
         #endregion
 
         public MainWindow()

Demo/Examples/DigitalSignature/Properties/AssemblyInfo.cs

@@ -20,5 +20,5 @@ using System.Windows;
     ResourceDictionaryLocation.SourceAssembly 
 )]
 
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/DocsEditor/DocsEditor.csproj

@@ -137,6 +137,10 @@
       <Link>x64\ComPDFKit.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="..\TestFile\ComPDFKit_Sample_File_Windows.pdf">
       <Link>ComPDFKit_Sample_File_Windows.pdf</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Demo/Examples/DocsEditor/MainWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:DocsEditor"
         xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
-        Title="Document Editor_ComPDFKit V1.11.0" Height="450" Width="800">
+        Title="{Binding AppInfo}" Height="450" Width="800">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

Demo/Examples/DocsEditor/MainWindow.xaml.cs

@@ -47,7 +47,10 @@ namespace DocsEditor
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
-
+        public string AppInfo
+        {
+            get { return Assembly.GetExecutingAssembly().GetName().Name + " " + string.Join(".", Assembly.GetExecutingAssembly().GetName().Version.ToString().Split('.').Take(3)); }
+        }
         #endregion
 
         public MainWindow()

Demo/Examples/DocsEditor/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Examlpes.sln

@@ -1037,114 +1037,18 @@ 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
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Debug|x64.Build.0 = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Debug|x86.Build.0 = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.DemoTest|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.DemoTest|Any CPU.Build.0 = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.DemoTest|x64.ActiveCfg = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.DemoTest|x64.Build.0 = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.DemoTest|x86.ActiveCfg = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.DemoTest|x86.Build.0 = Debug|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Release|x64.ActiveCfg = Release|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Release|x64.Build.0 = Release|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Release|x86.ActiveCfg = Release|Any CPU
-		{A8AF1E5F-E8A0-43E7-91CE-615580B29325}.Release|x86.Build.0 = Release|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Debug|x64.Build.0 = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Debug|x86.Build.0 = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.DemoTest|Any CPU.ActiveCfg = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.DemoTest|Any CPU.Build.0 = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.DemoTest|x64.ActiveCfg = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.DemoTest|x64.Build.0 = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.DemoTest|x86.ActiveCfg = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.DemoTest|x86.Build.0 = Debug|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Release|x64.ActiveCfg = Release|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Release|x64.Build.0 = Release|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Release|x86.ActiveCfg = Release|Any CPU
-		{5498DB67-4E92-4C6C-A8B9-4729165DEDB2}.Release|x86.Build.0 = Release|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Debug|x64.Build.0 = Debug|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Debug|x86.Build.0 = Debug|Any CPU
-		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.DemoTest|Any CPU.ActiveCfg = Debug|Any CPU
-		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.DemoTest|Any CPU.Build.0 = Debug|Any CPU
-		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.DemoTest|x64.ActiveCfg = Debug|Any CPU
-		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.DemoTest|x64.Build.0 = Debug|Any CPU
-		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.DemoTest|x86.ActiveCfg = Debug|Any CPU
-		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.DemoTest|x86.Build.0 = Debug|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Release|x64.ActiveCfg = Release|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Release|x64.Build.0 = Release|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.Release|x86.ActiveCfg = Release|Any CPU
 		{75A0C673-E1D8-4FCE-8804-95E4F0630200}.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}.DemoTest|Any CPU.ActiveCfg = Debug|Any CPU
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.DemoTest|Any CPU.Build.0 = Debug|Any CPU
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.DemoTest|x64.ActiveCfg = Debug|x64
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.DemoTest|x64.Build.0 = Debug|x64
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.DemoTest|x86.ActiveCfg = Debug|x86
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.DemoTest|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
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x64.ActiveCfg = Debug|x64
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x64.Build.0 = Debug|x64
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x86.ActiveCfg = Debug|x86
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Debug|x86.Build.0 = Debug|x86
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|Any CPU.ActiveCfg = DemoTest|Any CPU
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|Any CPU.Build.0 = DemoTest|Any CPU
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|x64.ActiveCfg = DemoTest|x64
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|x64.Build.0 = DemoTest|x64
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|x86.ActiveCfg = DemoTest|x86
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.DemoTest|x86.Build.0 = DemoTest|x86
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Release|x64.ActiveCfg = Release|x64
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Release|x64.Build.0 = Release|x64
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Release|x86.ActiveCfg = Release|x86
-		{A061EE7A-6704-4BD9-86EE-48ED5DF75E2F}.Release|x86.Build.0 = Release|x86
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x64.ActiveCfg = Debug|x64
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x64.Build.0 = Debug|x64
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x86.ActiveCfg = Debug|x86
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Debug|x86.Build.0 = Debug|x86
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|Any CPU.ActiveCfg = DemoTest|Any CPU
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|Any CPU.Build.0 = DemoTest|Any CPU
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|x64.ActiveCfg = DemoTest|x64
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|x64.Build.0 = DemoTest|x64
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|x86.ActiveCfg = DemoTest|x86
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.DemoTest|x86.Build.0 = DemoTest|x86
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Release|Any CPU.Build.0 = Release|Any CPU
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Release|x64.ActiveCfg = Release|x64
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Release|x64.Build.0 = Release|x64
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Release|x86.ActiveCfg = Release|x86
-		{783263CF-0DA3-4095-9DF8-2C4A6B3FF908}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Demo/Examples/Forms/Forms.csproj

@@ -114,6 +114,10 @@
       <Link>x64\ComPDFKit.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="..\TestFile\ComPDFKit_Forms_Sample_File.pdf">
       <Link>ComPDFKit_Forms_Sample_File.pdf</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

Demo/Examples/Forms/MainWindow.xaml

@@ -8,7 +8,7 @@
         xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
         Loaded="MainWindow_Loaded"
-        Title="Forms_ComPDFKit V1.11.0" Height="720" Width="1080">
+        Title="{Binding AppInfo}" Height="720" Width="1080">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

Demo/Examples/Forms/MainWindow.xaml.cs

@@ -77,9 +77,13 @@ namespace FormViewControl
                 OnPropertyChanged();
             }
         }
-        
+
+        public string AppInfo
+        {
+            get { return Assembly.GetExecutingAssembly().GetName().Name + " " + string.Join(".", Assembly.GetExecutingAssembly().GetName().Version.ToString().Split('.').Take(3)); }
+        }
         #endregion
-        
+
         public MainWindow()
         {
             InitializeComponent();

Demo/Examples/Forms/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Measure/MainWindow.xaml

@@ -7,7 +7,7 @@
                xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
         xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
-        Title="Measure_ComPDFKit V1.10.1" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
+        Title="{Binding AppInfo}" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

Demo/Examples/Measure/MainWindow.xaml.cs

@@ -27,6 +27,7 @@ using Path = System.IO.Path;
 using Compdfkit_Tools.Measure;
 using ComPDFKit.Tool;
 using static Compdfkit_Tools.Helper.PanelState;
+using System.Reflection;
 
 namespace Measure
 {
@@ -59,6 +60,11 @@ namespace Measure
                 return false;
             }
         }
+
+        public string AppInfo
+        {
+            get { return Assembly.GetExecutingAssembly().GetName().Name + " " + string.Join(".", Assembly.GetExecutingAssembly().GetName().Version.ToString().Split('.').Take(3)); }
+        }
         #endregion
 
         public MainWindow()

Demo/Examples/Measure/Measure.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{75A0C673-E1D8-4FCE-8804-95E4F0630200}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Measure</RootNamespace>
-    <AssemblyName>Measure_ComPDFKit</AssemblyName>
+    <AssemblyName>ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -57,6 +57,15 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ComPDFKit.Desk, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.1.13.0\lib\ComPDFKit.Desk.dll</HintPath>
+    </Reference>
+    <Reference Include="ComPDFKit.Viewer, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.1.13.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>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -110,6 +119,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="PDF32000_2008.pdf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -160,5 +170,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Demo/Examples/Measure/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.10.1.0")]
-[assembly: AssemblyFileVersion("1.10.1.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Measure/packages.config

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ComPDFKit.NetFramework" version="1.13.0" targetFramework="net461" />
+  <package id="PresentationFramework.Aero2" version="1.0.1" targetFramework="net461" />
+</packages>

Demo/Examples/PDFViewer/MainPage.xaml

@@ -182,7 +182,7 @@
                     <ComboBoxItem Tag="Content Editor" Content="{Binding Converter={StaticResource CommonResourceConverter},ConverterParameter=Func_ContentEditor}"></ComboBoxItem>
                     <ComboBoxItem Tag="Document Editor" Content="{Binding Converter={StaticResource CommonResourceConverter},ConverterParameter=Func_DocEditor}"></ComboBoxItem>
                     <ComboBoxItem Tag="Digital Signature" Content="{Binding Converter={StaticResource CommonResourceConverter},ConverterParameter=Func_Signatures}"></ComboBoxItem>
-                    <ComboBoxItem Tag="Measurement" Content="Measurement"></ComboBoxItem>
+                    <ComboBoxItem Tag="Measurement" Content="{Binding Converter={StaticResource CommonResourceConverter},ConverterParameter=Func_Measurement}"></ComboBoxItem>
                 </ComboBox>
 
                 <StackPanel Orientation="Horizontal" Grid.Column="2">

Demo/Examples/PDFViewer/MainPage.xaml.cs

@@ -245,6 +245,9 @@ namespace PDFViewer
                     case "Content Editor":
                         ModeComboBox.SelectedIndex = 3;
                         break;
+                    case "Measurement":
+                        ModeComboBox.SelectedIndex = 6;
+                        break;
                     default:
                         break;
                 }

Demo/Examples/PDFViewer/MainWindow.xaml.cs

@@ -48,6 +48,8 @@ namespace PDFViewer
             DataContext = this;
         }
 
+
+
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
             PasswordUI.Closed -= PasswordUI_Closed;

Demo/Examples/PDFViewer/PDFViewer.csproj

@@ -173,6 +173,10 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="x64\ComPDFKit.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

Demo/Examples/PDFViewer/Properties/AssemblyInfo.cs

@@ -24,5 +24,5 @@ using System.Windows;
     ResourceDictionaryLocation.SourceAssembly 
 )]
 
-[assembly: AssemblyVersion("1.12.0")]
-[assembly: AssemblyFileVersion("1.12.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/PDFViewer/Properties/Settings.Designer.cs

@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -11,7 +12,7 @@ namespace PDFViewer.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -116,5 +117,14 @@ namespace PDFViewer.Properties {
                 this["Divisor"] = value;
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("English")]
+        public string Language {
+            get {
+                return ((string)(this["Language"]));
+            }
+        }
     }
 }

Demo/Examples/Samples/AnnotationImportExportTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/AnnotationImportExportTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/AnnotationTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/AnnotationTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/BackgroundTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/BackgroundTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/BatesTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/BatesTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/BookmarkTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/BookmarkTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/DigitalSignatureTest/CS/DigitalSignatureTest.csproj

@@ -76,12 +76,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\license_key_windows.txt">
-      <Link>license_key_windows.txt</Link>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Logo.png">
+    <None Include="..\..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <Content Include="ComPDFKit_Logo.ico" />

Demo/Examples/Samples/DigitalSignatureTest/CS/Properties/AssemblyInfo.cs

@@ -15,5 +15,5 @@ using System.Runtime.InteropServices;
 
 [assembly: Guid("7372311c-7a31-4d97-a2c0-fc005fc345c1")]
 
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/DigitalSignatureTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/DocumentCompare/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/DocumentCompare/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/DocumentInfoTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/DocumentInfoTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/EncryptTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/EncryptTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/FlattenTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/FlattenTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/HeaderFooterTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/HeaderFooterTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/ImageExtractTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/ImageExtractTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/InteractiveFormsTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/InteractiveFormsTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/OutlineTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/OutlineTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/PDFATest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/PDFATest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/PDFPageTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/PDFPageTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/PDFRedactTest/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/PDFRedactTest/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>

Demo/Examples/Samples/PDFToImage/CS/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.12.0.0")]
-[assembly: AssemblyFileVersion("1.12.0.0")]
+[assembly: AssemblyVersion("1.13.0.0")]
+[assembly: AssemblyFileVersion("1.13.0.0")]

Demo/Examples/Samples/PDFToImage/VB/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.12.0.0")>
-<Assembly: AssemblyFileVersion("1.12.0.0")>
+<Assembly: AssemblyVersion("1.13.0.0")>
+<Assembly: AssemblyFileVersion("1.13.0.0")>