Просмотр исходного кода

compdfkit(windows) - 更换license

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

+ 1 - 1
Demo/Examples/Annotations/Annotations.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}</ProjectGuid>
     <ProjectGuid>{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Annotations</RootNamespace>
     <RootNamespace>Annotations</RootNamespace>
-    <AssemblyName>com.compdfkit.demo.annotation</AssemblyName>
+    <AssemblyName>Annotations_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 1 - 1
Demo/Examples/Annotations/App.xaml

@@ -6,7 +6,7 @@
     <Application.Resources>
     <Application.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Themes/Global.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Themes/Global.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
         </ResourceDictionary>
     </Application.Resources>
     </Application.Resources>

+ 5 - 5
Demo/Examples/Annotations/MainWindow.xaml

@@ -4,17 +4,17 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Annotations"
         xmlns:local="clr-namespace:Annotations"
-        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=com.compdfkit.tools"
-        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools"
+        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
+        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
         mc:Ignorable="d"
         Loaded="MainWindow_Loaded"
         Loaded="MainWindow_Loaded"
         Title="Annotations_ComPDFKit" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
         Title="Annotations_ComPDFKit" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
     <Window.Resources>
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
         </ResourceDictionary>
     </Window.Resources>
     </Window.Resources>

Разница между файлами не показана из-за своего большого размера
+ 232 - 218
Demo/Examples/Annotations/MainWindow.xaml.cs


+ 1 - 1
Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationPanel/PDFAnnotationUI/CPDFCreateSignatureDialog.xaml

@@ -418,7 +418,7 @@
                             <RowDefinition Height="38"/>
                             <RowDefinition Height="38"/>
                         </Grid.RowDefinitions>
                         </Grid.RowDefinitions>
                         <StackPanel x:Name="AddImagebackground" VerticalAlignment="Bottom">
                         <StackPanel x:Name="AddImagebackground" VerticalAlignment="Bottom">
-                            <Image Height="112" Width="112" Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/Signature/Dropimage.png"/>
+                            <Image Height="112" Width="112" Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/Signature/Dropimage.png"/>
                             <TextBlock Text="Drop image here"  HorizontalAlignment="Center"/>
                             <TextBlock Text="Drop image here"  HorizontalAlignment="Center"/>
                             <TextBlock Text="or"  HorizontalAlignment="Center"/>
                             <TextBlock Text="or"  HorizontalAlignment="Center"/>
                             <Button Style="{DynamicResource LinkButton}" HorizontalAlignment="Center" Content="Select a File" Click="OpenImage_Click"/>
                             <Button Style="{DynamicResource LinkButton}" HorizontalAlignment="Center" Content="Select a File" Click="OpenImage_Click"/>

+ 21 - 21
Demo/Examples/Compdfkit_Tools/Annotation/PDFAnnotationPanel/PDFAnnotationUI/CPDFStampUI.xaml.cs

@@ -19,27 +19,27 @@ namespace Compdfkit_Tools.Annotation.PDFAnnotationPanel.PDFAnnotationUI
 
 
         List<string> Path = new List<string>
         List<string> Path = new List<string>
         {
         {
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Approved.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/NotApproved.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Completed.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Final.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Draft.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Confidential.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/ForPublicRelease.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/NotForPublicRelease.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/ForComment.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Void.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/PreliminaryResults.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/InformationOnly.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Accepted.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Rejected.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/Witness.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/InitialHere.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/SignHere.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/revised.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/PrivateMark1.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/PrivateMark2.png",
-            "pack://application:,,,/com.compdfkit.tools;component/Asset/Resource/Annotation/StampIcons/PrivateMark3.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Approved.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/NotApproved.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Completed.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Final.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Draft.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Confidential.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/ForPublicRelease.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/NotForPublicRelease.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/ForComment.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Void.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/PreliminaryResults.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/InformationOnly.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Accepted.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Rejected.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/Witness.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/InitialHere.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/SignHere.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/revised.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/PrivateMark1.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/PrivateMark2.png",
+            "pack://application:,,,/Compdfkit_Tools;component/Asset/Resource/Annotation/StampIcons/PrivateMark3.png",
         };
         };
         List<string> StampText = new List<string>
         List<string> StampText = new List<string>
         {
         {

+ 1 - 1
Demo/Examples/Compdfkit_Tools/Compdfkit_Tools.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{9363BCB1-3A67-446A-8093-5708B86BF418}</ProjectGuid>
     <ProjectGuid>{9363BCB1-3A67-446A-8093-5708B86BF418}</ProjectGuid>
     <OutputType>Library</OutputType>
     <OutputType>Library</OutputType>
     <RootNamespace>Compdfkit_Tools</RootNamespace>
     <RootNamespace>Compdfkit_Tools</RootNamespace>
-    <AssemblyName>com.compdfkit.tools</AssemblyName>
+    <AssemblyName>ComPDFKit_Tools</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 1 - 1
Demo/Examples/ContentEditor/ContentEditor.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{03BC0C60-9D99-41D5-8116-F2516CBFCE54}</ProjectGuid>
     <ProjectGuid>{03BC0C60-9D99-41D5-8116-F2516CBFCE54}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
     <RootNamespace>ContentEditor</RootNamespace>
     <RootNamespace>ContentEditor</RootNamespace>
-    <AssemblyName>com.compdfkit.demo.edit</AssemblyName>
+    <AssemblyName>Content Editor_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 5 - 5
Demo/Examples/ContentEditor/MainWindow.xaml

@@ -4,16 +4,16 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ContentEditor"
         xmlns:local="clr-namespace:ContentEditor"
-        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=com.compdfkit.tools"
-        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools"
+        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
+        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
         mc:Ignorable="d"
         Title="Content Editor_ComPDFKit" Height="700" Width="1200" WindowStartupLocation="CenterScreen">
         Title="Content Editor_ComPDFKit" Height="700" Width="1200" WindowStartupLocation="CenterScreen">
     <Window.Resources>
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
         </ResourceDictionary>
     </Window.Resources>
     </Window.Resources>

Разница между файлами не показана из-за своего большого размера
+ 460 - 495
Demo/Examples/ContentEditor/MainWindow.xaml.cs


+ 1 - 1
Demo/Examples/DocsEditor/DocsEditor.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}</ProjectGuid>
     <ProjectGuid>{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
     <RootNamespace>DocsEditor</RootNamespace>
     <RootNamespace>DocsEditor</RootNamespace>
-    <AssemblyName>com.compdfkit.demo.pageedit</AssemblyName>
+    <AssemblyName>Docs Editor_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 5 - 5
Demo/Examples/DocsEditor/MainWindow.xaml

@@ -3,17 +3,17 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-          xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=com.compdfkit.tools"
+          xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
         xmlns:local="clr-namespace:DocsEditor"
         xmlns:local="clr-namespace:DocsEditor"
-        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools"
+        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
         mc:Ignorable="d"
         Title="Docs Editor_ComPDFKit" Height="450" Width="800">
         Title="Docs Editor_ComPDFKit" Height="450" Width="800">
     <Window.Resources>
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
         </ResourceDictionary>
     </Window.Resources>
     </Window.Resources>

+ 223 - 202
Demo/Examples/DocsEditor/MainWindow.xaml.cs

@@ -50,10 +50,6 @@ namespace DocsEditor
 
 
         #endregion
         #endregion
 
 
-        protected void OnPropertyChanged([CallerMemberName] string name = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
-        }
 
 
         public MainWindow()
         public MainWindow()
         {
         {
@@ -69,6 +65,8 @@ namespace DocsEditor
             LoadDefaultDocument();
             LoadDefaultDocument();
         }
         }
 
 
+        #region Load document
+
         private void LoadDefaultDocument()
         private void LoadDefaultDocument()
         {
         {
             string defaultFilePath = "PDF32000_2008.pdf";
             string defaultFilePath = "PDF32000_2008.pdf";
@@ -80,97 +78,65 @@ namespace DocsEditor
             pdfViewControl.PDFView.InitDocument(defaultFilePath);
             pdfViewControl.PDFView.InitDocument(defaultFilePath);
             LoadDocument();
             LoadDocument();
         }
         }
-
-        private void PdfViewer_InfoChanged(object sender, KeyValuePair<string, object> e)
-        {
-            if (e.Key == "Zoom")
-            {
-                CPDFSaclingControl.SetZoomTextBoxText(string.Format("{0}", (int)((double)e.Value * 100)));
-            }
-        }
-
-        private double CheckZoomLevel(double zoom, bool IsGrowth)
+         
+        private void LoadDocument()
         {
         {
-            double standardZoom = 100;
-            if (zoom <= 0.01)
-            {
-                return 0.01;
-            }
-            if (zoom >= 10)
+            pdfViewControl.PDFView?.SetMouseMode(MouseModes.Viewer);
+            pdfViewControl.PDFView?.Load();
+            pdfViewControl.PDFView?.SetShowLink(true);
+            if (ViewComboBox.SelectedIndex == 0)
             {
             {
-                return 10;
+                PDFGrid.Child = pdfViewControl;
             }
             }
-
-            zoom *= 100;
-            for (int i = 0; i < zoomLevelList.Length - 1; i++)
+            else
             {
             {
-                if (zoom > zoomLevelList[i] && zoom <= zoomLevelList[i + 1] && IsGrowth)
-                {
-                    standardZoom = zoomLevelList[i + 1];
-                    break;
-                }
-                if (zoom >= zoomLevelList[i] && zoom < zoomLevelList[i + 1] && !IsGrowth)
+                ToolBarContainer.Visibility = Visibility.Visible;
+                if (pageEditControl == null)
                 {
                 {
-                    standardZoom = zoomLevelList[i];
-                    break;
+                    pageEditControl = new CPDFPageEditControl();
                 }
                 }
-            }
-            return standardZoom / 100;
-        }
+                pageEditControl.ExitPageEdit -= PageEditControl_ExitPageEdit;
+                pageEditControl.ExitPageEdit += PageEditControl_ExitPageEdit;
 
 
-        private void CopyImage_Click(object sender, RoutedEventArgs e)
-        {
-            Dictionary<int, List<Bitmap>> imageDict = pdfViewControl.PDFView?.GetSelectedImages();
+                pageEditControl.PageMoved -= PageEditControl_PageMoved;
+                pageEditControl.PageMoved += PageEditControl_PageMoved;
 
 
-            if (imageDict != null && imageDict.Count > 0)
-            {
-                foreach (int pageIndex in imageDict.Keys)
-                {
-                    List<Bitmap> imageList = imageDict[pageIndex];
-                    foreach (Bitmap image in imageList)
-                    {
-                        MemoryStream ms = new MemoryStream();
-                        image.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
-                        BitmapImage imageData = new BitmapImage();
-                        imageData.BeginInit();
-                        imageData.StreamSource = ms;
-                        imageData.CacheOption = BitmapCacheOption.OnLoad;
-                        imageData.EndInit();
-                        imageData.Freeze();
-                        Clipboard.SetImage(imageData);
-                        break;
-                    }
-                }
+                CPDFPageEditBarControl.PageEditEvent -= CPDFPageEditBarControl_PageEditEvent;
+                CPDFPageEditBarControl.PageEditEvent += CPDFPageEditBarControl_PageEditEvent;
+                pageEditControl.LoadThumbnails(pdfViewControl.PDFView);
+                PDFGrid.Child = pageEditControl;
+                FloatPageTool.Visibility = Visibility.Collapsed;
             }
             }
-        }
-
-        private void ExtraImage_Click(object sender, RoutedEventArgs e)
-        {
-            System.Windows.Forms.FolderBrowserDialog folderDialog = new System.Windows.Forms.FolderBrowserDialog();
-            if (folderDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-            {
-                string choosePath = folderDialog.SelectedPath;
-                string openPath = choosePath;
-                Dictionary<int, List<Bitmap>> imageDict = pdfViewControl.PDFView?.GetSelectedImages();
+            pdfViewControl.PDFView.InfoChanged -= PdfViewer_InfoChanged;
+            pdfViewControl.PDFView.InfoChanged += PdfViewer_InfoChanged;
+            pdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
+            pdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
+            pdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
+            pdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
+            pdfViewControl.PDFView.SetFormFieldHighlight(true);
+            PasswordUI.Closed -= PasswordUI_Closed;
+            PasswordUI.Canceled -= PasswordUI_Canceled;
+            PasswordUI.Confirmed -= PasswordUI_Confirmed;
+            PasswordUI.Closed += PasswordUI_Closed;
+            PasswordUI.Canceled += PasswordUI_Canceled;
+            PasswordUI.Confirmed += PasswordUI_Confirmed;
 
 
-                if (imageDict != null && imageDict.Count > 0)
-                {
-                    foreach (int pageIndex in imageDict.Keys)
-                    {
-                        List<Bitmap> imageList = imageDict[pageIndex];
-                        foreach (Bitmap image in imageList)
-                        {
-                            string savePath = System.IO.Path.Combine(choosePath, Guid.NewGuid() + ".jpg");
-                            image.Save(savePath, System.Drawing.Imaging.ImageFormat.Jpeg);
-                            openPath = savePath;
-                        }
-                    }
-                }
-                Process.Start("explorer", "/select,\"" + openPath + "\"");
+            pdfViewControl.PDFView.ChangeFitMode(FitMode.FitWidth);
+            CPDFSaclingControl.InitWithPDFViewer(pdfViewControl.PDFView);
+            CPDFSaclingControl.SetZoomTextBoxText(string.Format("{0}", (int)(pdfViewControl.PDFView.ZoomFactor * 100)));
 
 
-            }
+            ViewSettingBtn.IsChecked = false;
+            PropertyContainer.Child = null;
+            PropertyContainer.Visibility = Visibility.Collapsed;
+            FloatPageTool.InitWithPDFViewer(pdfViewControl.PDFView);
+            BotaSideTool.InitWithPDFViewer(pdfViewControl.PDFView);
+            BotaSideTool.SelectBotaTool(BOTATools.Thumbnail);
         }
         }
 
 
+        #endregion
+
+        #region Context menu
+        
         private void PDFView_AnnotCommandHandler(object sender, AnnotCommandArgs e)
         private void PDFView_AnnotCommandHandler(object sender, AnnotCommandArgs e)
         {
         {
             if (e != null && e.CommandType == CommandType.Context)
             if (e != null && e.CommandType == CommandType.Context)
@@ -324,6 +290,62 @@ namespace DocsEditor
             }
             }
         }
         }
 
 
+        private void CopyImage_Click(object sender, RoutedEventArgs e)
+        {
+            Dictionary<int, List<Bitmap>> imageDict = pdfViewControl.PDFView?.GetSelectedImages();
+
+            if (imageDict != null && imageDict.Count > 0)
+            {
+                foreach (int pageIndex in imageDict.Keys)
+                {
+                    List<Bitmap> imageList = imageDict[pageIndex];
+                    foreach (Bitmap image in imageList)
+                    {
+                        MemoryStream ms = new MemoryStream();
+                        image.Save(ms, System.Drawing.Imaging.ImageFormat.Png);
+                        BitmapImage imageData = new BitmapImage();
+                        imageData.BeginInit();
+                        imageData.StreamSource = ms;
+                        imageData.CacheOption = BitmapCacheOption.OnLoad;
+                        imageData.EndInit();
+                        imageData.Freeze();
+                        Clipboard.SetImage(imageData);
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void ExtraImage_Click(object sender, RoutedEventArgs e)
+        {
+            System.Windows.Forms.FolderBrowserDialog folderDialog = new System.Windows.Forms.FolderBrowserDialog();
+            if (folderDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+            {
+                string choosePath = folderDialog.SelectedPath;
+                string openPath = choosePath;
+                Dictionary<int, List<Bitmap>> imageDict = pdfViewControl.PDFView?.GetSelectedImages();
+
+                if (imageDict != null && imageDict.Count > 0)
+                {
+                    foreach (int pageIndex in imageDict.Keys)
+                    {
+                        List<Bitmap> imageList = imageDict[pageIndex];
+                        foreach (Bitmap image in imageList)
+                        {
+                            string savePath = System.IO.Path.Combine(choosePath, Guid.NewGuid() + ".jpg");
+                            image.Save(savePath, System.Drawing.Imaging.ImageFormat.Jpeg);
+                            openPath = savePath;
+                        }
+                    }
+                }
+                Process.Start("explorer", "/select,\"" + openPath + "\"");
+
+            }
+        }
+
+        #endregion
+
+        #region password
         private void PasswordUI_Canceled(object sender, EventArgs e)
         private void PasswordUI_Canceled(object sender, EventArgs e)
         {
         {
             PopupBorder.Visibility = Visibility.Collapsed;
             PopupBorder.Visibility = Visibility.Collapsed;
@@ -357,72 +379,48 @@ namespace DocsEditor
             }
             }
         }
         }
 
 
-        private void LoadDocument()
-        {
-            pdfViewControl.PDFView?.SetMouseMode(MouseModes.Viewer);
-            pdfViewControl.PDFView?.Load();
-            pdfViewControl.PDFView?.SetShowLink(true);
-            if (ViewComboBox.SelectedIndex == 0)
-            {
-                PDFGrid.Child = pdfViewControl;
-            }
-            else
-            {
-                ToolBarContainer.Visibility = Visibility.Visible;
-                if (pageEditControl == null)
-                {
-                    pageEditControl = new CPDFPageEditControl();
-                }
-                pageEditControl.ExitPageEdit -= PageEditControl_ExitPageEdit;
-                pageEditControl.ExitPageEdit += PageEditControl_ExitPageEdit;
+        #endregion
+         
 
 
-                pageEditControl.PageMoved -= PageEditControl_PageMoved;
-                pageEditControl.PageMoved += PageEditControl_PageMoved;
+        #region Expand and collapse Panel
 
 
-                CPDFPageEditBarControl.PageEditEvent -= CPDFPageEditBarControl_PageEditEvent;
-                CPDFPageEditBarControl.PageEditEvent += CPDFPageEditBarControl_PageEditEvent;
-                pageEditControl.LoadThumbnails(pdfViewControl.PDFView);
-                PDFGrid.Child = pageEditControl;
-                FloatPageTool.Visibility = Visibility.Collapsed;
+        public void ExpandRightPropertyPanel(UIElement properytPanel, Visibility visible)
+        {
+            PropertyContainer.Width = 260;
+            PropertyContainer.Child = properytPanel;
+            PropertyContainer.Visibility = visible;
+            if (visible == Visibility.Hidden || visible == Visibility.Collapsed)
+            {
+                RightToolPanelButton.IsChecked = false;
             }
             }
-            pdfViewControl.PDFView.InfoChanged -= PdfViewer_InfoChanged;
-            pdfViewControl.PDFView.InfoChanged += PdfViewer_InfoChanged;
-            pdfViewControl.PDFView.AnnotCommandHandler -= PDFView_AnnotCommandHandler;
-            pdfViewControl.PDFView.AnnotCommandHandler += PDFView_AnnotCommandHandler;
-            pdfViewControl.PDFView.UndoManager.PropertyChanged -= UndoManager_PropertyChanged;
-            pdfViewControl.PDFView.UndoManager.PropertyChanged += UndoManager_PropertyChanged;
-            pdfViewControl.PDFView.SetFormFieldHighlight(true);
-            PasswordUI.Closed -= PasswordUI_Closed;
-            PasswordUI.Canceled -= PasswordUI_Canceled;
-            PasswordUI.Confirmed -= PasswordUI_Confirmed;
-            PasswordUI.Closed += PasswordUI_Closed;
-            PasswordUI.Canceled += PasswordUI_Canceled;
-            PasswordUI.Confirmed += PasswordUI_Confirmed;
-
-            pdfViewControl.PDFView.ChangeFitMode(FitMode.FitWidth);
-            CPDFSaclingControl.InitWithPDFViewer(pdfViewControl.PDFView);
-            CPDFSaclingControl.SetZoomTextBoxText(string.Format("{0}", (int)(pdfViewControl.PDFView.ZoomFactor * 100)));
-
-            ViewSettingBtn.IsChecked = false;
-            PropertyContainer.Child = null;
-            PropertyContainer.Visibility = Visibility.Collapsed;
-            FloatPageTool.InitWithPDFViewer(pdfViewControl.PDFView);
-            BotaSideTool.InitWithPDFViewer(pdfViewControl.PDFView);
-            BotaSideTool.SelectBotaTool(BOTATools.Thumbnail);
         }
         }
 
 
-        private void PageEditControl_PageMoved(object sender, RoutedEventArgs e)
+
+        private void ExpandLeftPanel(bool isExpand)
         {
         {
-            if (pdfViewControl == null || pdfViewControl.PDFView == null)
+            BotaSideTool.Visibility = isExpand ? Visibility.Visible : Visibility.Collapsed;
+            Splitter.Visibility = isExpand ? Visibility.Visible : Visibility.Collapsed;
+            if (isExpand)
             {
             {
-                return;
+                BodyGrid.ColumnDefinitions[0].Width = new GridLength(320);
+                BodyGrid.ColumnDefinitions[1].Width = new GridLength(15);
+            }
+            else
+            {
+                BodyGrid.ColumnDefinitions[0].Width = new GridLength(0);
+                BodyGrid.ColumnDefinitions[1].Width = new GridLength(0);
             }
             }
-            BotaSideTool.InitWithPDFViewer(pdfViewControl.PDFView);
         }
         }
 
 
-        private void UndoManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        #endregion
+
+        #region UI
+        private void PageInfoBtn_Click(object sender, RoutedEventArgs e)
         {
         {
-            OnPropertyChanged(e.PropertyName);
+            PasswordUI.Visibility = Visibility.Collapsed;
+            FileInfoUI.Visibility = Visibility.Visible;
+            FileInfoControl.InitWithPDFViewer(pdfViewControl.PDFView);
+            PopupBorder.Visibility = Visibility.Visible;
         }
         }
 
 
         private void OpenFile_Click(object sender, RoutedEventArgs e)
         private void OpenFile_Click(object sender, RoutedEventArgs e)
@@ -462,32 +460,6 @@ namespace DocsEditor
             }
             }
         }
         }
 
 
-        private void ExpandLeftPanel(bool isExpand)
-        {
-            BotaSideTool.Visibility = isExpand ? Visibility.Visible : Visibility.Collapsed;
-            Splitter.Visibility = isExpand ? Visibility.Visible : Visibility.Collapsed;
-            if (isExpand)
-            {
-                BodyGrid.ColumnDefinitions[0].Width = new GridLength(320);
-                BodyGrid.ColumnDefinitions[1].Width = new GridLength(15);
-            }
-            else
-            {
-                BodyGrid.ColumnDefinitions[0].Width = new GridLength(0);
-                BodyGrid.ColumnDefinitions[1].Width = new GridLength(0);
-            }
-        }
-
-        /// <summary>
-        /// 展开Bota工具
-        /// </summary>
-        /// <param name="isExpand"></param>
-        private void ExpandBotaTool(bool isExpand)
-        {
-            BotaSideTool.Visibility = isExpand ? Visibility.Visible : Visibility.Collapsed;
-            Splitter.Visibility = isExpand ? Visibility.Visible : Visibility.Collapsed;
-        }
-
         private void LeftToolPanelButton_Click(object sender, RoutedEventArgs e)
         private void LeftToolPanelButton_Click(object sender, RoutedEventArgs e)
         {
         {
             ToggleButton expandBtn = sender as ToggleButton;
             ToggleButton expandBtn = sender as ToggleButton;
@@ -504,28 +476,6 @@ namespace DocsEditor
             pdfViewControl.PDFView.UndoManager.CanSave = false;
             pdfViewControl.PDFView.UndoManager.CanSave = false;
         }
         }
 
 
-        private void SaveFile()
-        {
-            if (pdfViewControl != null && pdfViewControl.PDFView != null && pdfViewControl.PDFView.Document != null)
-            {
-                CPDFDocument pdfDoc = pdfViewControl.PDFView.Document;
-                if (pdfDoc.WriteToLoadedPath())
-                {
-                    return;
-                }
-
-                SaveFileDialog saveDialog = new SaveFileDialog();
-                saveDialog.Filter = "(*.pdf)|*.pdf";
-                saveDialog.DefaultExt = ".pdf";
-                saveDialog.OverwritePrompt = true;
-
-                if (saveDialog.ShowDialog() == true)
-                {
-                    pdfDoc.WriteToFilePath(saveDialog.FileName);
-                }
-            }
-        }
-
         private void FileInfoCloseBtn_Click(object sender, RoutedEventArgs e)
         private void FileInfoCloseBtn_Click(object sender, RoutedEventArgs e)
         {
         {
             PopupBorder.Visibility = Visibility.Collapsed;
             PopupBorder.Visibility = Visibility.Collapsed;
@@ -539,17 +489,6 @@ namespace DocsEditor
             BotaSideTool.SelectBotaTool(BOTATools.Search);
             BotaSideTool.SelectBotaTool(BOTATools.Search);
         }
         }
 
 
-        public void ExpandRightPropertyPanel(UIElement properytPanel, Visibility visible)
-        {
-            PropertyContainer.Width = 260;
-            PropertyContainer.Child = properytPanel;
-            PropertyContainer.Visibility = visible;
-            if (visible == Visibility.Hidden || visible == Visibility.Collapsed)
-            {
-                RightToolPanelButton.IsChecked = false;
-            }
-        }
-
         private void RightToolPanelButton_Click(object sender, RoutedEventArgs e)
         private void RightToolPanelButton_Click(object sender, RoutedEventArgs e)
         {
         {
             ToggleButton toggleButton = sender as ToggleButton;
             ToggleButton toggleButton = sender as ToggleButton;
@@ -595,16 +534,65 @@ namespace DocsEditor
             }
             }
         }
         }
 
 
-        private void PageInfoBtn_Click(object sender, RoutedEventArgs e)
+        private double CheckZoomLevel(double zoom, bool IsGrowth)
         {
         {
-            PasswordUI.Visibility = Visibility.Collapsed;
-            FileInfoUI.Visibility = Visibility.Visible;
-            FileInfoControl.InitWithPDFViewer(pdfViewControl.PDFView);
-            PopupBorder.Visibility = Visibility.Visible;
+            double standardZoom = 100;
+            if (zoom <= 0.01)
+            {
+                return 0.01;
+            }
+            if (zoom >= 10)
+            {
+                return 10;
+            }
+
+            zoom *= 100;
+            for (int i = 0; i < zoomLevelList.Length - 1; i++)
+            {
+                if (zoom > zoomLevelList[i] && zoom <= zoomLevelList[i + 1] && IsGrowth)
+                {
+                    standardZoom = zoomLevelList[i + 1];
+                    break;
+                }
+                if (zoom >= zoomLevelList[i] && zoom < zoomLevelList[i + 1] && !IsGrowth)
+                {
+                    standardZoom = zoomLevelList[i];
+                    break;
+                }
+            }
+            return standardZoom / 100;
         }
         }
 
 
+
+        #endregion
+
+        #region Save file
+        private void SaveFile()
+        {
+            if (pdfViewControl != null && pdfViewControl.PDFView != null && pdfViewControl.PDFView.Document != null)
+            {
+                CPDFDocument pdfDoc = pdfViewControl.PDFView.Document;
+                if (pdfDoc.WriteToLoadedPath())
+                {
+                    return;
+                }
+
+                SaveFileDialog saveDialog = new SaveFileDialog();
+                saveDialog.Filter = "(*.pdf)|*.pdf";
+                saveDialog.DefaultExt = ".pdf";
+                saveDialog.OverwritePrompt = true;
+
+                if (saveDialog.ShowDialog() == true)
+                {
+                    pdfDoc.WriteToFilePath(saveDialog.FileName);
+                }
+            }
+        }
+
+        #endregion
+
         #region Selection changed
         #region Selection changed
-            
+
         private void ViewComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         private void ViewComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
         {
             if (isFirstLoad)
             if (isFirstLoad)
@@ -666,6 +654,7 @@ namespace DocsEditor
 
 
         #endregion
         #endregion
 
 
+        #region Event handle
         private void CPDFPageEditBarControl_PageEditEvent(object sender, string e)
         private void CPDFPageEditBarControl_PageEditEvent(object sender, string e)
         {
         {
             pageEditControl.PageEdit(e);
             pageEditControl.PageEdit(e);
@@ -675,5 +664,37 @@ namespace DocsEditor
         {
         {
             ViewComboBox.SelectedIndex = 0;
             ViewComboBox.SelectedIndex = 0;
         }
         }
+         
+        private void UndoManager_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e.PropertyName);
+        }
+        private void PageEditControl_PageMoved(object sender, RoutedEventArgs e)
+        {
+            if (pdfViewControl == null || pdfViewControl.PDFView == null)
+            {
+                return;
+            }
+            BotaSideTool.InitWithPDFViewer(pdfViewControl.PDFView);
+        }
+
+        private void PdfViewer_InfoChanged(object sender, KeyValuePair<string, object> e)
+        {
+            if (e.Key == "Zoom")
+            {
+                CPDFSaclingControl.SetZoomTextBoxText(string.Format("{0}", (int)((double)e.Value * 100)));
+            }
+        }
+
+        #endregion
+
+        #region Property changed
+
+        protected void OnPropertyChanged([CallerMemberName] string name = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+        }
+
+        #endregion
     }
     }
 }
 }

+ 1 - 1
Demo/Examples/Forms/Forms.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{0F35ACB7-E10B-4AAE-AA77-88E4602C3EFB}</ProjectGuid>
     <ProjectGuid>{0F35ACB7-E10B-4AAE-AA77-88E4602C3EFB}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Forms</RootNamespace>
     <RootNamespace>Forms</RootNamespace>
-    <AssemblyName>com.compdfkit.demo.form</AssemblyName>
+    <AssemblyName>Forms_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 5 - 5
Demo/Examples/Forms/MainWindow.xaml

@@ -3,16 +3,16 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=com.compdfkit.tools"
-        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools"
+        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
+        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
         mc:Ignorable="d"
         Title="Forms_ComPDFKit" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
         Title="Forms_ComPDFKit" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
     <Window.Resources>
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
         </ResourceDictionary>
     </Window.Resources>
     </Window.Resources>

+ 1 - 1
Demo/Examples/PDFViewer/App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:compdfkit"
              xmlns:local="clr-namespace:compdfkit"
-             xmlns:common="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools"
+             xmlns:common="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
              StartupUri="MainWindow.xaml">
              StartupUri="MainWindow.xaml">
     <Application.Resources>
     <Application.Resources>
         <common:WindowStateToThicknessConverter x:Key="WindowStateToThicknessConverter"></common:WindowStateToThicknessConverter>
         <common:WindowStateToThicknessConverter x:Key="WindowStateToThicknessConverter"></common:WindowStateToThicknessConverter>

+ 5 - 5
Demo/Examples/PDFViewer/MainPage.xaml

@@ -3,17 +3,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"  
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"  
-            xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=com.compdfkit.tools"
-            xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools" 
+            xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
+            xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools" 
              mc:Ignorable="d" 
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
              d:DesignHeight="450" d:DesignWidth="800"
              Loaded="UserControl_Loaded">
              Loaded="UserControl_Loaded">
     <UserControl.Resources>
     <UserControl.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
         </ResourceDictionary>
     </UserControl.Resources>
     </UserControl.Resources>

+ 2 - 2
Demo/Examples/PDFViewer/MainWindow.xaml

@@ -4,8 +4,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=com.compdfkit.tools"
-        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools"
+        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
+        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"   
         mc:Ignorable="d"   
         SnapsToDevicePixels="True" 
         SnapsToDevicePixels="True" 
         xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"
         xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz"

+ 1 - 1
Demo/Examples/PDFViewer/PDFViewer.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{807EE747-34A1-4E03-8B72-9E9F6C3BB002}</ProjectGuid>
     <ProjectGuid>{807EE747-34A1-4E03-8B72-9E9F6C3BB002}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
     <RootNamespace>PDFViewer</RootNamespace>
     <RootNamespace>PDFViewer</RootNamespace>
-    <AssemblyName>com.compdfkit.demo</AssemblyName>
+    <AssemblyName>ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

+ 4 - 4
Demo/Examples/Viewer/MainWindow.xaml

@@ -4,15 +4,15 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Viewer"
         xmlns:local="clr-namespace:Viewer"
-        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=com.compdfkit.tools"
-        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=com.compdfkit.tools"
+        xmlns:cpdftools="clr-namespace:Compdfkit_Tools.PDFControl;assembly=Compdfkit_Tools"
+        xmlns:cpdfcommon="clr-namespace:Compdfkit_Tools.Common;assembly=Compdfkit_Tools"
         mc:Ignorable="d"
         mc:Ignorable="d"
         Title="Viewer_ComPDFKit" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
         Title="Viewer_ComPDFKit" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
     <Window.Resources>
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/com.compdfkit.tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
         </ResourceDictionary>
     </Window.Resources>
     </Window.Resources>

+ 1 - 1
Demo/Examples/Viewer/Viewer.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}</ProjectGuid>
     <ProjectGuid>{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Viewer</RootNamespace>
     <RootNamespace>Viewer</RootNamespace>
-    <AssemblyName>com.compdfkit.demo.viewer</AssemblyName>
+    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
Demo/Examples/license_key_win.xml