compdfkit demo(windows) viewmode drawmode命名调整

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

@@ -58,7 +58,7 @@
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
                 <cpdftools:CPDFScalingControl x:Name="CPDFScalingControl"/>
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
-                <cpdftools:CPDFBrowseModeControl x:Name="CPDFBrowseModeControl"/>
+                <cpdftools:CPDFViewModeControl x:Name="CPDFViewModeControl"/>
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
                 <cpdftools:CPDFColorModeControl x:Name="CPDFColorModeControl"/>
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>

compdfkit_demo_windows/compdfkit/compdfkit-tools/Common/Bar/PDFAnnotationBarControl.xaml

@@ -0,0 +1,11 @@
+<UserControl x:Class="compdfkit_tools.PDFControl.PDFAnnotationBarControl"
+             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" 
+             mc:Ignorable="d" 
+             d:DesignHeight="40" d:DesignWidth="1280">
+    <Grid>
+            
+    </Grid>
+</UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/Common/Bar/PDFAnnotationBarControl.xaml.cs

@@ -0,0 +1,51 @@
+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 compdfkit_tools.PDFControl
+{
+    public enum AnnotationProperties
+    {
+        Markup,
+        FreeText,
+        Note,
+        Sharp,
+        Line,
+        Stamp,
+        Signature,
+        Link,
+        Sound
+    }
+
+    /// <summary>
+    /// PDFAnnotationBarControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class PDFAnnotationBarControl : UserControl
+    {
+        public PDFAnnotationBarControl(AnnotationProperties[] annotationProperties)
+        {
+            InitializeComponent();
+            InitAnnotationBar(annotationProperties);
+        }
+
+        private void InitAnnotationBar(AnnotationProperties[] annotationProperties)
+        {
+            for(int i = 0; i < annotationProperties.Length; i++)
+            {
+                AnnotationProperties annotation = annotationProperties[i];
+
+            }
+        }
+    }
+}

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFColorModeControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControl.CPDFColorModeControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFDrawModeControl"
              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" 
@@ -8,6 +8,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="30" d:DesignWidth="210">
     <Grid>
-        <pdftoolsui:CPDFColorModeUI x:Name="CPDFColorModeUI"></pdftoolsui:CPDFColorModeUI>
+        <pdftoolsui:CPDFDrawModeUI x:Name="CPDFDrawModeUI"></pdftoolsui:CPDFDrawModeUI>
     </Grid>
 </UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFColorModeControl.xaml.cs

@@ -18,21 +18,21 @@ using System.Windows.Shapes;
 namespace compdfkit_tools.PDFControl
 {
     /// <summary>
-    /// PDFColorModeControl.xaml 的交互逻辑
+    /// PDFDrawModeControl.xaml 的交互逻辑
     /// </summary>
-    public partial class CPDFColorModeControl : UserControl
+    public partial class CPDFDrawModeControl : UserControl
     {
         public CPDFViewer pdfViewer;
 
         public Dictionary<string, DrawModes> GetDrawMode = new Dictionary<string, DrawModes>();
 
-        public CPDFColorModeControl()
+        public CPDFDrawModeControl()
         {
             InitializeComponent();
-            CPDFColorModeUI.Loaded += CPDFColorModeUI_Loaded;
+            CPDFDrawModeUI.Loaded += CPDFDrawModeUI_Loaded;
         }
 
-        private void CPDFColorModeUI_Loaded(object sender, RoutedEventArgs e)
+        private void CPDFDrawModeUI_Loaded(object sender, RoutedEventArgs e)
         {
             GetDrawMode.Clear();
             GetDrawMode.Add("Normal", DrawModes.Draw_Mode_Normal);
@@ -40,10 +40,10 @@ namespace compdfkit_tools.PDFControl
             GetDrawMode.Add("Dark", DrawModes.Draw_Mode_Dark);
             GetDrawMode.Add("Green", DrawModes.Draw_Mode_Green);
             GetDrawMode.Add("Custom", DrawModes.Draw_Mode_Custom);
-            CPDFColorModeUI.SetColorModeEvent += CPDFColorModeUI_SetColorModeEvent;
+            CPDFDrawModeUI.SetDrawModeEvent += CPDFDrawModeUI_SetColorModeEvent;
         }
 
-        private void CPDFColorModeUI_SetColorModeEvent(object sender, string e)
+        private void CPDFDrawModeUI_SetColorModeEvent(object sender, string e)
         {
             pdfViewer.SetDrawMode(GetDrawMode[(sender as RadioButton).Tag as string]);
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFBrowseModeControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControl.CPDFBrowseModeControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFViewModeControl"
              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" 
@@ -8,6 +8,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="30" d:DesignWidth="350">
     <Grid>
-        <pdftoolsui:CPDFBrowseModeUI x:Name="CPDFBrowseModeUI"></pdftoolsui:CPDFBrowseModeUI>
+        <pdftoolsui:CPDFViewModeUI x:Name="CPDFViewModeUI"></pdftoolsui:CPDFViewModeUI>
     </Grid>
 </UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFBrowseModeControl.xaml.cs

@@ -17,21 +17,21 @@ using System.Windows.Shapes;
 namespace compdfkit_tools.PDFControl
 {
     /// <summary>
-    /// PDFBrowseModeControl.xaml 的交互逻辑
+    /// CPDFViewModeControl.xaml 的交互逻辑
     /// </summary>
-    public partial class CPDFBrowseModeControl : UserControl
+    public partial class CPDFViewModeControl : UserControl
     {
         public CPDFViewer pdfViewer;
 
         public string CurrentContinuousMode = "Continuous";
-        public string CurrentBrowseMode = "Single";
+        public string CurrentViewMode = "Single";
 
         public Dictionary<Tuple<string, string>, ComPDFKitViewer.ViewMode> GetViewMode = new Dictionary<Tuple<string, string>, ComPDFKitViewer.ViewMode>();
         
-        public CPDFBrowseModeControl()
+        public CPDFViewModeControl()
         {
             InitializeComponent();
-            CPDFBrowseModeUI.Loaded += CPDFBrowseModeUI_Loaded;
+            CPDFViewModeUI.Loaded += CPDFViewModeUI_Loaded;
         }
 
         public void InitWithPDFViewer(CPDFViewer pdfViewer)
@@ -39,7 +39,7 @@ namespace compdfkit_tools.PDFControl
             this.pdfViewer = pdfViewer;
         }
 
-        private void CPDFBrowseModeUI_Loaded(object sender, RoutedEventArgs e)
+        private void CPDFViewModeUI_Loaded(object sender, RoutedEventArgs e)
         {
             GetViewMode.Clear();
             GetViewMode.Add(Tuple.Create("Continuous", "Single"), ComPDFKitViewer.ViewMode.SingleContinuous);
@@ -48,20 +48,20 @@ namespace compdfkit_tools.PDFControl
             GetViewMode.Add(Tuple.Create("Discontinuous", "Single"), ComPDFKitViewer.ViewMode.Single);
             GetViewMode.Add(Tuple.Create("Discontinuous", "Double"), ComPDFKitViewer.ViewMode.Double);
             GetViewMode.Add(Tuple.Create("Discontinuous", "Book"), ComPDFKitViewer.ViewMode.Book);
-            CPDFBrowseModeUI.SetContinuousEvent += CPDFBrowseModeUI_SetContinuousEvent;
-            CPDFBrowseModeUI.SetBrowsingModeEvent += CPDFBrowseModeUI_SetBrowsingModeEvent;
+            CPDFViewModeUI.SetContinuousEvent += CPDFViewModeUI_SetContinuousEvent;
+            CPDFViewModeUI.SetViewModeEvent += CPDFViewModeUI_SetViewModeEvent;
         }
 
-        private void CPDFBrowseModeUI_SetContinuousEvent(object sender, string e)
+        private void CPDFViewModeUI_SetContinuousEvent(object sender, string e)
         {
             CurrentContinuousMode = (sender as RadioButton).Tag as string;
-            pdfViewer.ChangeViewMode(GetViewMode[Tuple.Create(CurrentContinuousMode, CurrentBrowseMode)]);
+            pdfViewer.ChangeViewMode(GetViewMode[Tuple.Create(CurrentContinuousMode, CurrentViewMode)]);
         }
 
-        private void CPDFBrowseModeUI_SetBrowsingModeEvent(object sender, string e)
+        private void CPDFViewModeUI_SetViewModeEvent(object sender, string e)
         {
-            CurrentBrowseMode = (sender as RadioButton).Tag as string;
-            pdfViewer.ChangeViewMode(GetViewMode[Tuple.Create(CurrentContinuousMode, CurrentBrowseMode)]);
+            CurrentViewMode = (sender as RadioButton).Tag as string;
+            pdfViewer.ChangeViewMode(GetViewMode[Tuple.Create(CurrentContinuousMode, CurrentViewMode)]);
         } 
     }
 }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsUI/CPDFColorModeUI.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFColorModeUI"
+<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFDrawModeUI"
              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" 
@@ -15,19 +15,19 @@
     <Grid Height="30">
         <Rectangle Width="1" HorizontalAlignment="Left"></Rectangle>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="0">
-            <RadioButton GroupName="DrawMode" Tag="Normal" IsChecked="True" Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode" Tag="Normal" IsChecked="True" Click="DrawMode_Click">
                 <TextBlock Text="白"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="DrawMode"  Tag="Dark"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode"  Tag="Dark"  Click="DrawMode_Click">
                 <TextBlock Text="夜"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="DrawMode"  Tag="Soft"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode"  Tag="Soft"  Click="DrawMode_Click">
                 <TextBlock Text="阅读"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="DrawMode"  Tag="Green"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode"  Tag="Green"  Click="DrawMode_Click">
                 <TextBlock Text="护眼"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="DrawMode" Tag="Custom" x:Name="Custom"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode" Tag="Custom" x:Name="Custom"  Click="DrawMode_Click">
                 <TextBlock Text="自定义"></TextBlock>
             </RadioButton>
         </StackPanel>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsUI/CPDFColorModeUI.xaml.cs

@@ -17,21 +17,21 @@ using System.Windows.Shapes;
 namespace compdfkit_tools.PDFControlUI
 {
     /// <summary>
-    /// colormode.xaml 的交互逻辑
+    /// DrawModeUI.xaml 的交互逻辑
     /// </summary>
-    public partial class CPDFColorModeUI : UserControl
+    public partial class CPDFDrawModeUI : UserControl
     {
-        public event EventHandler<string> SetColorModeEvent;
-        public event EventHandler<string> SetCustomColorModeEvent;
-        public CPDFColorModeUI()
+        public event EventHandler<string> SetDrawModeEvent;
+        public event EventHandler<string> SetCustomDrawModeEvent;
+        public CPDFDrawModeUI()
         {
             InitializeComponent();
         }
 
-        private void ThemeMode_Click(object sender, RoutedEventArgs e)
+        private void DrawMode_Click(object sender, RoutedEventArgs e)
         {
-            var colorModeRadioButton = sender as RadioButton;
-            SetColorModeEvent?.Invoke(sender, colorModeRadioButton.Tag as string);
+            var drawModeRadioButton = sender as RadioButton;
+            SetDrawModeEvent?.Invoke(sender, drawModeRadioButton.Tag as string);
         }
     }
 }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsUI/CPDFBrowseModeUI.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFBrowseModeUI"
+<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFViewModeUI"
              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" 
@@ -14,13 +14,13 @@
                 <TextBlock Text="不连续"></TextBlock>
             </RadioButton>
             <Rectangle Margin="10,0,10,0" Width="1" Fill="Black"></Rectangle>
-            <RadioButton x:Name="SinglePageModeRadioButton" GroupName="BrowsingMode" Tag="Single" IsChecked="True" Checked="BrowsingModeRadioButton_Checked">
+            <RadioButton x:Name="SinglePageModeRadioButton" GroupName="ViewMode" Tag="Single" IsChecked="True" Checked="ViewModeRadioButton_Checked">
                 <TextBlock Text="单页"></TextBlock>
             </RadioButton>
-            <RadioButton x:Name="DoublePageModeRadioButton" GroupName="BrowsingMode" Tag="Double" Grid.Row="1" Checked="BrowsingModeRadioButton_Checked">
+            <RadioButton x:Name="DoublePageModeRadioButton" GroupName="ViewMode" Tag="Double" Grid.Row="1" Checked="ViewModeRadioButton_Checked">
                 <TextBlock Text="双页"></TextBlock>
             </RadioButton>
-            <RadioButton x:Name="BookModeRadioButton" GroupName="BrowsingMode" Grid.Row="2" Tag="Book" Checked="BrowsingModeRadioButton_Checked">
+            <RadioButton x:Name="BookModeRadioButton" GroupName="ViewMode" Grid.Row="2" Tag="Book" Checked="ViewModeRadioButton_Checked">
                 <TextBlock Text="封面"></TextBlock>
             </RadioButton>
         </StackPanel>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsUI/CPDFBrowseModeUI.xaml.cs

@@ -18,20 +18,20 @@ namespace compdfkit_tools.PDFControlUI
     /// <summary>
     /// browsemode.xaml 的交互逻辑
     /// </summary>
-    public partial class CPDFBrowseModeUI : UserControl
+    public partial class CPDFViewModeUI : UserControl
     {
         public event EventHandler<string> SetContinuousEvent;
-        public event EventHandler<string> SetBrowsingModeEvent;
+        public event EventHandler<string> SetViewModeEvent;
 
-        public CPDFBrowseModeUI()
+        public CPDFViewModeUI()
         {
             InitializeComponent(); 
         }
 
-        private void BrowsingModeRadioButton_Checked(object sender, RoutedEventArgs e)
+        private void ViewModeRadioButton_Checked(object sender, RoutedEventArgs e)
         {
-            var browsingModeRadioButton = sender as RadioButton;
-            SetBrowsingModeEvent?.Invoke(sender, browsingModeRadioButton.Tag as string);
+            var viewModeRadioButton = sender as RadioButton;
+            SetViewModeEvent?.Invoke(sender, viewModeRadioButton.Tag as string);
         }
 
         private void ContinuousRadioButton_Click(object sender, RoutedEventArgs e)

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

@@ -68,6 +68,9 @@
     <Compile Include="Common\Bar\ModeSelectorBarControl.xaml.cs">
       <DependentUpon>ModeSelectorBarControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Common\Bar\PDFAnnotationBarControl.xaml.cs">
+      <DependentUpon>PDFAnnotationBarControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Common\Bar\TitleBarControl.xaml.cs">
       <DependentUpon>TitleBarControl.xaml</DependentUpon>
     </Compile>
@@ -82,8 +85,8 @@
     <Compile Include="PDFView\PDFBookmark\PDFBookmarkUI\CPDFBookmarkResultUI.xaml.cs">
       <DependentUpon>CPDFBookmarkResultUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFBrowseModeControl.xaml.cs">
-      <DependentUpon>CPDFBrowseModeControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFViewModeControl.xaml.cs">
+      <DependentUpon>CPDFViewModeControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="PDFView\PDFInfo\CPDFInfoControl.xaml.cs">
       <DependentUpon>CPDFInfoControl.xaml</DependentUpon>
@@ -110,8 +113,8 @@
     <Compile Include="PDFView\PDFThumbnail\PDFThumbnailUI\CPdfThumbnailUI.xaml.cs">
       <DependentUpon>CPdfThumbnailUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFColorModeControl.xaml.cs">
-      <DependentUpon>CPDFColorModeControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFDrawModeControl.xaml.cs">
+      <DependentUpon>CPDFDrawModeControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="PDFView\PDFInfo\CPDFAbstractInfoControl.xaml.cs">
       <DependentUpon>CPDFAbstractInfoControl.xaml</DependentUpon>
@@ -141,11 +144,11 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFBrowseModeUI.xaml.cs">
-      <DependentUpon>CPDFBrowseModeUI.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFViewModeUI.xaml.cs">
+      <DependentUpon>CPDFViewModeUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFColorModeUI.xaml.cs">
-      <DependentUpon>CPDFColorModeUI.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFDrawModeUI.xaml.cs">
+      <DependentUpon>CPDFDrawModeUI.xaml</DependentUpon>
     </Compile>
     <Compile Include="PDFView\PDFPageTurning\PDFPageTurningUI\CPDFPageTurningUI.xaml.cs">
       <DependentUpon>CPDFPageTurningUI.xaml</DependentUpon>
@@ -162,7 +165,9 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Annotation\PDFAnnotationList\" />
+  </ItemGroup>
   <ItemGroup>
     <Page Include="Asset\Style\MenuItemStyle.xaml">
       <SubType>Designer</SubType>
@@ -180,6 +185,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Common\Bar\PDFAnnotationBarControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Common\Bar\TitleBarControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -232,19 +241,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFBrowseModeControl.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFViewModeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFColorModeControl.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFDrawModeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFBrowseModeUI.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFViewModeUI.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFColorModeUI.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFDrawModeUI.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

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

@@ -125,9 +125,9 @@
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
                 <cpdftools:CPDFScalingControl x:Name="CPDFScalingControl"/>
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
-                <cpdftools:CPDFBrowseModeControl x:Name="CPDFBrowseModeControl"/>
+                <cpdftools:CPDFViewModeControl x:Name="CPDFViewModeControl"/>
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
-                <cpdftools:CPDFColorModeControl x:Name="CPDFColorModeControl"/>
+                <cpdftools:CPDFDrawModeControl x:Name="CPDFDrawModeControl"/>
                 <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
                 <Button x:Name="PDFInfoButton" Height="30" Width="60" Click="PDFInfoButton_Click">
                     <TextBlock Text="文档属性"></TextBlock>

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

@@ -30,8 +30,8 @@ namespace viewer_ctrl_demo
 
             CPDFScalingControl.InitWithPDFViewer(pdfViewer);
             CPDFPageTurningControl.InitWithPDFViewer(pdfViewer);
-            CPDFBrowseModeControl.InitWithPDFViewer(pdfViewer);
-            CPDFColorModeControl.InitWithPDFViewer(pdfViewer);
+            CPDFViewModeControl.InitWithPDFViewer(pdfViewer);
+            CPDFDrawModeControl.InitWithPDFViewer(pdfViewer);
 
             UIElement currentBotaTool = GetBotaTool();
             if (currentBotaTool is CPDFSearchControl)