compdfkit demo(windows) - 程序集、命名空间调整，代码整合

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/App.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    </startup>
+</configuration>

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/App.xaml

@@ -0,0 +1,9 @@
+<Application x:Class="annotation_ctrl_demo.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:annotation_ctrl_demo"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/App.xaml.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace annotation_ctrl_demo
+{
+    /// <summary>
+    /// App.xaml 的交互逻辑
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/MainWindow.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="annotation_ctrl_demo.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:annotation_ctrl_demo"
+        mc:Ignorable="d"
+        Title="MainWindow" Height="450" Width="800">
+    <Grid>
+        
+    </Grid>
+</Window>

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/MainWindow.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace annotation_ctrl_demo
+{
+    /// <summary>
+    /// MainWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+    }
+}

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/Properties/AssemblyInfo.cs

@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("annotation-ctrl-demo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("annotation-ctrl-demo")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+//若要开始生成可本地化的应用程序，请设置
+//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
+//例如，如果您在源文件中使用的是美国英语，
+//使用的是美国英语，请将 <UICulture> 设置为 en-US。  然后取消
+//对以下 NeutralResourceLanguage 特性的注释。  更新
+//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //主题特定资源词典所处位置
+                                     //(未在页面中找到资源时使用，
+                                     //或应用程序资源字典中找到时使用)
+    ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
+                                              //(未在页面中找到资源时使用，
+                                              //、应用程序或任何主题专用资源字典中找到时使用)
+)]
+
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本: 4.0.30319.42000
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace annotation_ctrl_demo.Properties
+{
+
+
+    /// <summary>
+    ///   强类型资源类，用于查找本地化字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   返回此类使用的缓存 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("annotation_ctrl_demo.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/Properties/Resources.resx

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/Properties/Settings.Designer.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <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.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace annotation_ctrl_demo.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

compdfkit_demo_windows/compdfkit/annotation-ctrl-demo/annotation-ctrl-demo.csproj

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>annotation_ctrl_demo</RootNamespace>
+    <AssemblyName>com.compdfkit.demo.annotation</AssemblyName>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

compdfkit_demo_windows/compdfkit/compdfkit-assets/compdfkit-assets.csproj

@@ -54,15 +54,15 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="styles\ButtonStyle.xaml">
+    <Page Include="Styles\ButtonStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="styles\TextBoxStyle.xaml">
+    <Page Include="Styles\TextBoxStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="themes\Global.xaml">
+    <Page Include="Themes\Global.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -92,7 +92,7 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
-    <Resource Include="resourse\ComPDFKit_Logo.png">
+    <Resource Include="Resourse\ComPDFKit_Logo.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>

compdfkit_demo_windows/compdfkit/compdfkit-tools/compdfkit-tools.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{9363BCB1-3A67-446A-8093-5708B86BF418}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>compdfkit_tools</RootNamespace>
-    <AssemblyName>compdfkit-tools</AssemblyName>
+    <AssemblyName>com.compdfkit.tools</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -54,10 +54,10 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="pdfsearch\SearchInputControl.xaml.cs">
+    <Compile Include="PDFSearch\SearchInputControl.xaml.cs">
       <DependentUpon>SearchInputControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="pdfsearch\SearchResultControl.xaml.cs">
+    <Compile Include="PDFSearch\SearchResultControl.xaml.cs">
       <DependentUpon>SearchResultControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -73,20 +73,20 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="util\pdfdisplaysettings\browsemode.xaml.cs">
-      <DependentUpon>browsemode.xaml</DependentUpon>
+    <Compile Include="Util\PDFDisplaySettings\BrowseModeControl.xaml.cs">
+      <DependentUpon>BrowseModeControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="util\pdfdisplaysettings\colormode.xaml.cs">
-      <DependentUpon>colormode.xaml</DependentUpon>
+    <Compile Include="Util\PDFDisplaySettings\ColorModeControl.xaml.cs">
+      <DependentUpon>ColorModeControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="util\pdfdisplaysettings\scrollmode.xaml.cs">
-      <DependentUpon>scrollmode.xaml</DependentUpon>
+    <Compile Include="Util\PDFDisplaySettings\ScrollModeControl.xaml.cs">
+      <DependentUpon>ScrollModeControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="util\pdfdisplaysettings\singlesettings.xaml.cs">
-      <DependentUpon>singlesettings.xaml</DependentUpon>
+    <Compile Include="Util\PDFDisplaySettings\SingleSettingsControl.xaml.cs">
+      <DependentUpon>SingleSettingsControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="util\pdfpageturning.xaml.cs">
-      <DependentUpon>pdfpageturning.xaml</DependentUpon>
+    <Compile Include="Util\PDFPageTurning.xaml.cs">
+      <DependentUpon>PDFPageTurning.xaml</DependentUpon>
     </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -97,40 +97,37 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <Folder Include="pdfview\" />
-    <Folder Include="util\assets\themes\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="pdfsearch\SearchInputControl.xaml">
+    <Page Include="PDFSearch\SearchInputControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="pdfsearch\SearchResultControl.xaml">
+    <Page Include="PDFSearch\SearchResultControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="util\assets\styles\TextBoxStyle.xaml">
+    <Page Include="Util\Assets\Styles\TextBoxStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="util\pdfdisplaysettings\browsemode.xaml">
+    <Page Include="Util\PDFDisplaySettings\BrowseModeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="util\pdfdisplaysettings\colormode.xaml">
+    <Page Include="Util\PDFDisplaySettings\ColorModeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="util\pdfdisplaysettings\scrollmode.xaml">
+    <Page Include="Util\PDFDisplaySettings\ScrollModeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="util\pdfdisplaysettings\singlesettings.xaml">
+    <Page Include="Util\PDFDisplaySettings\SingleSettingsControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="util\pdfpageturning.xaml">
+    <Page Include="Util\PDFPageTurning.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

compdfkit_demo_windows/compdfkit/compdfkit-tools/pdfsearch/SearchInputControl.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="compdfkit_tools.pdfsearch.SearchInputControl"
+<UserControl x:Class="compdfkit_tools.SearchInputControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:compdfkit_tools.pdfsearch"
+             xmlns:local="clr-namespace:compdfkit_tools"
              mc:Ignorable="d" 
              d:DesignHeight="150" d:DesignWidth="800">
     <Grid Margin="5">

compdfkit_demo_windows/compdfkit/compdfkit-tools/pdfsearch/SearchInputControl.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.pdfsearch
+namespace compdfkit_tools
 {
     /// <summary>
     /// 搜索输入控件

compdfkit_demo_windows/compdfkit/compdfkit-tools/pdfsearch/SearchResultControl.xaml

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

compdfkit_demo_windows/compdfkit/compdfkit-tools/pdfsearch/SearchResultControl.xaml.cs

@@ -15,7 +15,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.pdfsearch
+namespace compdfkit_tools
 {
     /// <summary>
     /// 搜索结果控件

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/browsemode.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="compdfkit_tools.util.pdfdisplaysettings.browsemode"
+<UserControl x:Class="compdfkit_tools.BrowseModeControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:compdfkit_tools.util.pdfdisplaysettings"
+             xmlns:local="clr-namespace:compdfkit_tools"
              mc:Ignorable="d" 
              d:DesignHeight="80" d:DesignWidth="210">
     <Grid>

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/browsemode.xaml.cs

@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.util.pdfdisplaysettings
+namespace compdfkit_tools
 {
     /// <summary>
     /// browsemode.xaml 的交互逻辑
     /// </summary>
-    public partial class browsemode : UserControl
+    public partial class BrowseModeControl : UserControl
     {
-        public browsemode()
+        public BrowseModeControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/colormode.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="compdfkit_tools.util.pdfdisplaysettings.colormode"
+<UserControl x:Class="compdfkit_tools.ColorModeControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:compdfkit_tools.util.pdfdisplaysettings"
+             xmlns:local="clr-namespace:compdfkit_tools"
              mc:Ignorable="d" 
              d:DesignHeight="80" d:DesignWidth="210">
     <Grid>

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/colormode.xaml.cs

@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.util.pdfdisplaysettings
+namespace compdfkit_tools
 {
     /// <summary>
     /// colormode.xaml 的交互逻辑
     /// </summary>
-    public partial class colormode : UserControl
+    public partial class ColorModeControl : UserControl
     {
-        public colormode()
+        public ColorModeControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/scrollmode.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="compdfkit_tools.util.pdfdisplaysettings.scrollmode"
+<UserControl x:Class="compdfkit_tools.ScrollModeControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:compdfkit_tools.util.pdfdisplaysettings"
+             xmlns:local="clr-namespace:compdfkit_tools"
              mc:Ignorable="d" 
               d:DesignHeight="60" d:DesignWidth="210">
     <Grid>

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/scrollmode.xaml.cs

@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.util.pdfdisplaysettings
+namespace compdfkit_tools
 {
     /// <summary>
     /// scrollmode.xaml 的交互逻辑
     /// </summary>
-    public partial class scrollmode : UserControl
+    public partial class ScrollModeControl : UserControl
     {
-        public scrollmode()
+        public ScrollModeControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/singlesettings.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="compdfkit_tools.util.pdfdisplaysettings.singlesettings"
+<UserControl x:Class="compdfkit_tools.SingleSettingsControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:compdfkit_tools.util.pdfdisplaysettings"
+             xmlns:local="clr-namespace:compdfkit_tools"
              mc:Ignorable="d" 
              d:DesignHeight="60" d:DesignWidth="210">
     <Grid>

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfdisplaysettings/singlesettings.xaml.cs

@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.util.pdfdisplaysettings
+namespace compdfkit_tools
 {
     /// <summary>
     /// singlesettings.xaml 的交互逻辑
     /// </summary>
-    public partial class singlesettings : UserControl
+    public partial class SingleSettingsControl : UserControl
     {
-        public singlesettings()
+        public SingleSettingsControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfpageturning.xaml

@@ -1,9 +1,9 @@
-<UserControl x:Class="compdfkit_tools.util.pdfpageturning"
+<UserControl x:Class="compdfkit_tools.PDFPageTurningControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:compdfkit_tools.util"
+             xmlns:local="clr-namespace:compdfkit_tools"
              mc:Ignorable="d" 
              d:DesignHeight="40" d:DesignWidth="150">
     <UserControl.Resources>

compdfkit_demo_windows/compdfkit/compdfkit-tools/util/pdfpageturning.xaml.cs

@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.util
+namespace compdfkit_tools
 {
     /// <summary>
     /// pdfpageturning.xaml 的交互逻辑
     /// </summary>
-    public partial class pdfpageturning : UserControl
+    public partial class PDFPageTurningControl : UserControl
     {
-        public pdfpageturning()
+        public PDFPageTurningControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit.sln

@@ -22,6 +22,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDKLicense", "SDKLicense",
 		SDKLicense.xml = SDKLicense.xml
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "annotation-ctrl-demo", "annotation-ctrl-demo\annotation-ctrl-demo.csproj", "{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -56,6 +58,10 @@ Global
 		{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7A2B42C-55CC-4E48-A4DC-5E3239F23203}.Release|Any CPU.Build.0 = Release|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{018AF31A-EDFB-42B1-A9DF-ECF950CA62B1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

compdfkit_demo_windows/compdfkit/edit-ctrl-demo/edit-ctrl-demo.csproj

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

compdfkit_demo_windows/compdfkit/pageedit-ctrl-demo/pageedit-ctrl-demo.csproj

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

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/MainWindow.xaml

@@ -4,8 +4,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:viewer_ctrl_demo"
-        xmlns:tools="clr-namespace:compdfkit_tools.util;assembly=compdfkit-tools"
-        xmlns:custools="clr-namespace:viewer_ctrl_demo.pdfdisplaysettings"
+        xmlns:tools="clr-namespace:compdfkit_tools;assembly=com.compdfkit.tools"
+        xmlns:custools="clr-namespace:viewer_ctrl_demo.PDFDisplaySettings"
         mc:Ignorable="d"
         Title="MainWindow" Height="800" Width="1280">
     <Grid>
@@ -27,11 +27,11 @@
                     <ToggleButton x:Name="displaySettingsToggleButton" Height="40" Width="40" Margin="10,0,0,0" Click="displaySettingsToggleButton_Click">S</ToggleButton>
                     <Popup x:Name="popup" PlacementTarget="{Binding ElementName=displaySettingsToggleButton}" Margin="0,5,0,0" Placement="Bottom" IsOpen="False">
                         <Border Background="White" BorderBrush="Black" BorderThickness="1" Padding="10">
-                            <custools:displaysettings></custools:displaysettings>
+                            <custools:PDFDisplaySettings></custools:PDFDisplaySettings>
                         </Border>
                     </Popup>
                     <ToggleButton Height="40" Width="40" Margin="10,0,0,0">H</ToggleButton>
-                    <tools:pdfpageturning Margin="10,0,0,0"></tools:pdfpageturning>
+                    <tools:PDFPageTurningControl Margin="10,0,0,0"></tools:PDFPageTurningControl>
                 </StackPanel>
             </Border>
         </Grid>

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/MainWindow.xaml.cs

@@ -15,7 +15,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using viewer_ctrl_demo.bota;
+using viewer_ctrl_demo.Bota;
 
 namespace viewer_ctrl_demo
 {

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/bota/PDFSearch.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="viewer_ctrl_demo.bota.PDFSearch"
+<UserControl x:Class="viewer_ctrl_demo.Bota.PDFSearch"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:viewer_ctrl_demo.bota"
-             xmlns:searchtool="clr-namespace:compdfkit_tools.pdfsearch;assembly=compdfkit-tools"
+             xmlns:local="clr-namespace:viewer_ctrl_demo.Bota"
+             xmlns:tools="clr-namespace:compdfkit_tools;assembly=com.compdfkit.tools"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
@@ -12,7 +12,7 @@
             <RowDefinition Height="auto"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <searchtool:SearchInputControl Name="SearchInput" InputTextBoxHeight="25"></searchtool:SearchInputControl>
-        <searchtool:SearchResultControl Name="SearchResult" Grid.Row="1"></searchtool:SearchResultControl>
+        <tools:SearchInputControl Name="SearchInput" InputTextBoxHeight="25"></tools:SearchInputControl>
+        <tools:SearchResultControl Name="SearchResult" Grid.Row="1"></tools:SearchResultControl>
     </Grid>
 </UserControl>

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/bota/PDFSearch.xaml.cs

@@ -1,5 +1,5 @@
 using ComPDFKit.PDFPage;
-using compdfkit_tools.pdfsearch;
+using compdfkit_tools;
 using ComPDFKitViewer.PdfViewer;
 using System;
 using System.Collections.Generic;
@@ -17,7 +17,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace viewer_ctrl_demo.bota
+namespace viewer_ctrl_demo.Bota
 {
     public partial class PDFSearch : UserControl
     {
@@ -31,6 +31,7 @@ namespace viewer_ctrl_demo.bota
 
         private void PDFSearch_Loaded(object sender, RoutedEventArgs e)
         {
+            
             textSearch = new PDFTextSearch();
             SearchInput.SearchEvent += SearchInput_SearchEvent;
             SearchInput.FindEvent += SearchInput_FindEvent;

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/pdfdisplaysettings/displaysettings.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="viewer_ctrl_demo.pdfdisplaysettings.displaysettings"
+<UserControl x:Class="viewer_ctrl_demo.PDFDisplaySettings.PDFDisplaySettings"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:viewer_ctrl_demo.pdfdisplaysettings"
-             xmlns:dstools="clr-namespace:compdfkit_tools.util.pdfdisplaysettings;assembly=compdfkit-tools"
+             xmlns:local="clr-namespace:viewer_ctrl_demo.PDFDisplaySettings"
+             xmlns:tools="clr-namespace:compdfkit_tools;assembly=com.compdfkit.tools"
              mc:Ignorable="d" 
              d:DesignHeight="265" d:DesignWidth="210">
     <Grid>
@@ -14,9 +14,9 @@
             <RowDefinition></RowDefinition>
             <RowDefinition></RowDefinition>
         </Grid.RowDefinitions>
-        <dstools:browsemode></dstools:browsemode>
-        <dstools:scrollmode Grid.Row="1"></dstools:scrollmode>
-        <dstools:singlesettings Grid.Row="2"></dstools:singlesettings>
-        <dstools:colormode Grid.Row="3"></dstools:colormode>
+        <tools:BrowseModeControl></tools:BrowseModeControl>
+        <tools:ScrollModeControl Grid.Row="1"></tools:ScrollModeControl>
+        <tools:SingleSettingsControl Grid.Row="2"></tools:SingleSettingsControl>
+        <tools:ColorModeControl Grid.Row="3"></tools:ColorModeControl>
     </Grid>
 </UserControl>

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/pdfdisplaysettings/displaysettings.xaml.cs

@@ -13,14 +13,14 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace viewer_ctrl_demo.pdfdisplaysettings
+namespace viewer_ctrl_demo.PDFDisplaySettings
 {
     /// <summary>
     /// displaysettings.xaml 的交互逻辑
     /// </summary>
-    public partial class displaysettings : UserControl
+    public partial class PDFDisplaySettings : UserControl
     {
-        public displaysettings()
+        public PDFDisplaySettings()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/viewer-ctrl-demo.csproj

@@ -61,7 +61,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="bota\PDFSearch.xaml">
+    <Page Include="Bota\PDFSearch.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -73,21 +73,21 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="bota\PDFSearch.xaml.cs">
+    <Compile Include="Bota\PDFSearch.xaml.cs">
       <DependentUpon>PDFSearch.xaml</DependentUpon>
     </Compile>
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="pdfdisplaysettings\displaysettings.xaml">
+    <Page Include="PDFDisplaySettings\PDFDisplaySettings.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="pdfdisplaysettings\displaysettings.xaml.cs">
-      <DependentUpon>displaysettings.xaml</DependentUpon>
+    <Compile Include="PDFDisplaySettings\PDFDisplaySettings.xaml.cs">
+      <DependentUpon>PDFDisplaySettings.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>