compdfkit demo(windows) - merge conflict

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

@@ -1,9 +1,8 @@
-<UserControl x:Class="compdfkit_tools.Common.Bar.DisplaySettingsBarControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.DisplaySettingsBarControl"
              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.Common.Bar"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>

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

@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.Common.Bar
+namespace compdfkit_tools.PDFControl
 {
     /// <summary>
     /// DisplaySettingsBarControl.xaml 的交互逻辑

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

@@ -3,7 +3,6 @@
              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.Common.Bar"
              mc:Ignorable="d" 
                        d:DesignHeight="40" d:DesignWidth="1280">
     <UserControl.Resources>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControls/PDFBrowseModeControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControl.PDFBrowseModeControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFBrowseModeControl"
              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:PDFBrowseModeUI x:Name="PDFBrowseModeUI"></pdftoolsui:PDFBrowseModeUI>
+        <pdftoolsui:CPDFBrowseModeUI x:Name="CPDFBrowseModeUI"></pdftoolsui:CPDFBrowseModeUI>
     </Grid>
 </UserControl>

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

@@ -0,0 +1,67 @@
+using ComPDFKitViewer.PdfViewer;
+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
+{
+    /// <summary>
+    /// PDFBrowseModeControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class CPDFBrowseModeControl : UserControl
+    {
+        public CPDFViewer pdfViewer;
+
+        public string CurrentContinuousMode = "Continuous";
+        public string CurrentBrowseMode = "Single";
+
+        public Dictionary<Tuple<string, string>, ComPDFKitViewer.ViewMode> GetViewMode = new Dictionary<Tuple<string, string>, ComPDFKitViewer.ViewMode>();
+        
+        public CPDFBrowseModeControl()
+        {
+            InitializeComponent();
+            CPDFBrowseModeUI.Loaded += CPDFBrowseModeUI_Loaded;
+        }
+
+        public void InitWithPDFViewer(CPDFViewer pdfViewer)
+        {
+            this.pdfViewer = pdfViewer;
+        }
+
+        private void CPDFBrowseModeUI_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetViewMode.Clear();
+            GetViewMode.Add(Tuple.Create("Continuous", "Single"), ComPDFKitViewer.ViewMode.SingleContinuous);
+            GetViewMode.Add(Tuple.Create("Continuous", "Double"), ComPDFKitViewer.ViewMode.DoubleContinuous);
+            GetViewMode.Add(Tuple.Create("Continuous", "Book"), ComPDFKitViewer.ViewMode.BookContinuous);
+            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;
+        }
+
+        private void CPDFBrowseModeUI_SetContinuousEvent(object sender, string e)
+        {
+            CurrentContinuousMode = (sender as RadioButton).Tag as string;
+            pdfViewer.ChangeViewMode(GetViewMode[Tuple.Create(CurrentContinuousMode, CurrentBrowseMode)]);
+        }
+
+        private void CPDFBrowseModeUI_SetBrowsingModeEvent(object sender, string e)
+        {
+            CurrentBrowseMode = (sender as RadioButton).Tag as string;
+            pdfViewer.ChangeViewMode(GetViewMode[Tuple.Create(CurrentContinuousMode, CurrentBrowseMode)]);
+        } 
+    }
+}

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControls/PDFColorModeControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControl.PDFColorModeControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFColorModeControl"
              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:PDFColorModeUI x:Name="PDFColorModeUI"></pdftoolsui:PDFColorModeUI>
+        <pdftoolsui:CPDFColorModeUI x:Name="CPDFColorModeUI"></pdftoolsui:CPDFColorModeUI>
     </Grid>
 </UserControl>

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

@@ -0,0 +1,56 @@
+using ComPDFKitViewer;
+using ComPDFKitViewer.PdfViewer;
+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
+{
+    /// <summary>
+    /// PDFColorModeControl.xaml 的交互逻辑
+    /// </summary>
+    public partial class CPDFColorModeControl : UserControl
+    {
+        public CPDFViewer pdfViewer;
+
+        public Dictionary<string, DrawModes> GetDrawMode = new Dictionary<string, DrawModes>();
+
+        public CPDFColorModeControl()
+        {
+            InitializeComponent();
+            CPDFColorModeUI.Loaded += CPDFColorModeUI_Loaded;
+        }
+
+        private void CPDFColorModeUI_Loaded(object sender, RoutedEventArgs e)
+        {
+            GetDrawMode.Clear();
+            GetDrawMode.Add("Normal", DrawModes.Draw_Mode_Normal);
+            GetDrawMode.Add("Soft", DrawModes.Draw_Mode_Soft);
+            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;
+        }
+
+        private void CPDFColorModeUI_SetColorModeEvent(object sender, string e)
+        {
+            pdfViewer.SetDrawMode(GetDrawMode[(sender as RadioButton).Tag as string]);
+        }
+
+        public void InitWithPDFViewer(CPDFViewer pdfViewer)
+        {
+            this.pdfViewer = pdfViewer;
+        }
+    }
+}

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControls/PDFColorModeControl.xaml.cs

@@ -1,30 +0,0 @@
-using ComPDFKitViewer.PdfViewer;
-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
-{
-    /// <summary>
-    /// PDFColorModeControl.xaml 的交互逻辑
-    /// </summary>
-    public partial class PDFColorModeControl : UserControl
-    {
-        public CPDFViewer pdfViewer;
-        public PDFColorModeControl()
-        {
-            InitializeComponent();
-        }
-    }
-}

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

@@ -0,0 +1,28 @@
+<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFBrowseModeUI"
+             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="30" d:DesignWidth="350">
+    <Grid Height="30">
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+            <RadioButton x:Name="ContinuousRadioButton" Tag="Continuous" GroupName="Continuous" IsChecked="True" Click="ContinuousRadioButton_Click">
+                <TextBlock Text="连续"></TextBlock>
+            </RadioButton>
+            <RadioButton x:Name="DiscontinuousRadioButton" Tag="Discontinuous" GroupName="Continuous" Click="ContinuousRadioButton_Click">
+                <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">
+                <TextBlock Text="单页"></TextBlock>
+            </RadioButton>
+            <RadioButton x:Name="DoublePageModeRadioButton" GroupName="BrowsingMode" Tag="Double" Grid.Row="1" Checked="BrowsingModeRadioButton_Checked">
+                <TextBlock Text="双页"></TextBlock>
+            </RadioButton>
+            <RadioButton x:Name="BookModeRadioButton" GroupName="BrowsingMode" Grid.Row="2" Tag="Book" Checked="BrowsingModeRadioButton_Checked">
+                <TextBlock Text="封面"></TextBlock>
+            </RadioButton>
+        </StackPanel>
+    </Grid>
+</UserControl>

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

@@ -18,11 +18,12 @@ namespace compdfkit_tools.PDFControlUI
     /// <summary>
     /// browsemode.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFBrowseModeUI : UserControl
+    public partial class CPDFBrowseModeUI : UserControl
     {
+        public event EventHandler<string> SetContinuousEvent;
         public event EventHandler<string> SetBrowsingModeEvent;
 
-        public PDFBrowseModeUI()
+        public CPDFBrowseModeUI()
         {
             InitializeComponent(); 
         }
@@ -30,7 +31,13 @@ namespace compdfkit_tools.PDFControlUI
         private void BrowsingModeRadioButton_Checked(object sender, RoutedEventArgs e)
         {
             var browsingModeRadioButton = sender as RadioButton;
-            SetBrowsingModeEvent?.Invoke(sender, browsingModeRadioButton.Name);
+            SetBrowsingModeEvent?.Invoke(sender, browsingModeRadioButton.Tag as string);
+        }
+
+        private void ContinuousRadioButton_Click(object sender, RoutedEventArgs e)
+        {
+            var continuousRadioButton = sender as RadioButton;
+            SetContinuousEvent?.Invoke(sender,(continuousRadioButton.Tag as string));
         }
     }
 }

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

@@ -1,9 +1,8 @@
-<UserControl x:Class="compdfkit_tools.PDFControlUI.PDFColorModeUI"
+<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFColorModeUI"
              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.PDFControlUI"
              mc:Ignorable="d" 
              d:DesignHeight="30" d:DesignWidth="210">
     <UserControl.Resources>
@@ -16,19 +15,19 @@
     <Grid Height="30">
         <Rectangle Width="1" HorizontalAlignment="Left"></Rectangle>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="0">
-            <RadioButton GroupName="Theme" x:Name="DayMode" IsChecked="True" Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode" Tag="Normal" IsChecked="True" Click="ThemeMode_Click">
                 <TextBlock Text="白"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="Theme"  x:Name="NightMode"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode"  Tag="Dark"  Click="ThemeMode_Click">
                 <TextBlock Text="夜"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="Theme"  x:Name="ReadingMode"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode"  Tag="Soft"  Click="ThemeMode_Click">
                 <TextBlock Text="阅读"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="Theme"  x:Name="EyeCareMode"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode"  Tag="Green"  Click="ThemeMode_Click">
                 <TextBlock Text="护眼"></TextBlock>
             </RadioButton>
-            <RadioButton GroupName="Theme" x:Name="CustomMode"  Click="ThemeMode_Click">
+            <RadioButton GroupName="DrawMode" Tag="Custom" x:Name="Custom"  Click="ThemeMode_Click">
                 <TextBlock Text="自定义"></TextBlock>
             </RadioButton>
         </StackPanel>

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing.Imaging;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -18,17 +19,18 @@ namespace compdfkit_tools.PDFControlUI
     /// <summary>
     /// colormode.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFColorModeUI : UserControl
+    public partial class CPDFColorModeUI : UserControl
     {
-        public event EventHandler SetColorModeEvent;
-        public PDFColorModeUI()
+        public event EventHandler<string> SetColorModeEvent;
+        public CPDFColorModeUI()
         {
             InitializeComponent();
         }
 
         private void ThemeMode_Click(object sender, RoutedEventArgs e)
         {
-            SetColorModeEvent?.Invoke(this, EventArgs.Empty);
+            var colorModeRadioButton = sender as RadioButton;
+            SetColorModeEvent?.Invoke(sender, colorModeRadioButton.Tag as string);
         }
     }
 }

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

@@ -1,33 +0,0 @@
-<UserControl x:Class="compdfkit_tools.PDFControlUI.PDFBrowseModeUI"
-             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.PDFControlUI"
-             mc:Ignorable="d" 
-             d:DesignHeight="30" d:DesignWidth="350">
-    <Grid Height="30">
-        <Rectangle Width="1" HorizontalAlignment="Left"></Rectangle>
-            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <RadioButton x:Name="SinglePageModeRadioButton" GroupName="BrowsingMode" IsChecked="True" Checked="BrowsingModeRadioButton_Checked">
-                    <TextBlock Text="单页"></TextBlock>
-                </RadioButton>
-                <RadioButton x:Name="SinglePageContinuousModeRadioButton" GroupName="BrowsingMode" Grid.Column="1" IsChecked="True" Checked="BrowsingModeRadioButton_Checked">
-                    <TextBlock Text="单页连续"></TextBlock>
-                </RadioButton>
-                <RadioButton x:Name="DoublePageModeRadioButton" GroupName="BrowsingMode" Grid.Row="1"  Checked="BrowsingModeRadioButton_Checked">
-                    <TextBlock Text="双页"></TextBlock>
-                </RadioButton>
-                <RadioButton x:Name="DoublePageContinuousModeRadioButton" GroupName="BrowsingMode" Grid.Column="1" Grid.Row="1"  Checked="BrowsingModeRadioButton_Checked">
-                    <TextBlock Text="双页连续"></TextBlock>
-                </RadioButton>
-                <RadioButton x:Name="BookModeRadioButton" GroupName="BrowsingMode" Grid.Row="2"  Checked="BrowsingModeRadioButton_Checked">
-                    <TextBlock Text="封面"></TextBlock>
-                </RadioButton>
-                <RadioButton x:Name="BookContinuousModeRadioButton" GroupName="BrowsingMode" Grid.Row="2" Grid.Column="1" Checked="BrowsingModeRadioButton_Checked">
-                    <TextBlock Text="封面连续"></TextBlock>
-                </RadioButton>
-            </StackPanel>
-        <Rectangle Width="1" HorizontalAlignment="Right"></Rectangle>
-    </Grid>
-</UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFInfo/PDFAbstractInfoControl.xaml

@@ -1,9 +1,8 @@
-<UserControl x:Class="compdfkit_tools.PDFAbstractInfoControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFAbstractInfoControl"
              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"
              mc:Ignorable="d" 
              d:DesignHeight="220" d:DesignWidth="200">
     <Grid Margin="10,0,0,0">

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFInfo/PDFAbstractInfoControl.xaml.cs

@@ -15,12 +15,12 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools
+namespace compdfkit_tools.PDFControl
 {
     /// <summary>
     /// PDFAbstractInfoControl.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFAbstractInfoControl : UserControl
+    public partial class CPDFAbstractInfoControl : UserControl
     {
         private CPDFDocument _pdfDocument;
         public CPDFDocument PDFDocument
@@ -33,7 +33,7 @@ namespace compdfkit_tools
             }
         }
 
-        public PDFAbstractInfoControl()
+        public CPDFAbstractInfoControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFInfo/PDFCreateInfoControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFCreateInfoControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFCreateInfoControl"
              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" 

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFInfo/PDFCreateInfoControl.xaml.cs

@@ -15,12 +15,12 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools
+namespace compdfkit_tools.PDFControl
 {
     /// <summary>
     /// PDFCreateInfoControl.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFCreateInfoControl : UserControl
+    public partial class CPDFCreateInfoControl : UserControl
     {
         private CPDFDocument _pdfDocument;
         public CPDFDocument PDFDocument
@@ -33,7 +33,7 @@ namespace compdfkit_tools
             }
         }
 
-        public PDFCreateInfoControl()
+        public CPDFCreateInfoControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFInfo/CPDFInfoControl.xaml

@@ -0,0 +1,17 @@
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFInfoControl"
+             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:cpdftools="clr-namespace:compdfkit_tools.PDFControl"
+
+             mc:Ignorable="d" 
+             d:DesignHeight="240" d:DesignWidth="600">
+    <Grid>
+        <StackPanel Orientation="Horizontal">
+            <cpdftools:CPDFAbstractInfoControl x:Name="CPDFAbstractInfoControl" Width="200"></cpdftools:CPDFAbstractInfoControl>
+            <cpdftools:CPDFCreateInfoControl x:Name="CPDFCreateInfoControl" Width="200"></cpdftools:CPDFCreateInfoControl>
+            <cpdftools:CPDFSecurityInfoControl x:Name="CPDFSecurityInfoControl" Width="200"></cpdftools:CPDFSecurityInfoControl>
+        </StackPanel>
+    </Grid>
+</UserControl>

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/PDFDocumetInfo/PDFDocumentInfoControl.xaml.cs

@@ -15,25 +15,25 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace viewer_ctrl_demo.PDFDocumetInfo
+namespace compdfkit_tools.PDFControl
 {
     /// <summary>
     /// PDFDocumentInfoControl.xaml 的交互逻辑
     /// </summary>xc
-    public partial class PDFDocumentInfoControl : UserControl
+    public partial class CPDFInfoControl : UserControl
     {
         public CPDFDocument PDFDocument
         {
             private get => PDFDocument;
             set
             {
-                PDFAbstractInfoControl.PDFDocument = value;
-                PDFCreateInfoControl.PDFDocument = value;
-                PDFSecurityInfoControl.PDFDocument = value;
+                CPDFAbstractInfoControl.PDFDocument = value;
+                CPDFCreateInfoControl.PDFDocument = value;
+                CPDFSecurityInfoControl.PDFDocument = value;
             }
         }
 
-        public PDFDocumentInfoControl()
+        public CPDFInfoControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFInfo/PDFSecurityInfoControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFSecurityInfoControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFSecurityInfoControl"
              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" 

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFInfo/PDFSecurityInfoControl.xaml.cs

@@ -14,12 +14,12 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools
+namespace compdfkit_tools.PDFControl
 {
     /// <summary>
     /// PDFSecurityInfoControl.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFSecurityInfoControl : UserControl
+    public partial class CPDFSecurityInfoControl : UserControl
     {
         private string T_Allowed = "allowed";
         private string T_NotAllowed = "not allowed";
@@ -35,7 +35,7 @@ namespace compdfkit_tools
             }
         }
 
-        public PDFSecurityInfoControl()
+        public CPDFSecurityInfoControl()
         {
             InitializeComponent();
         }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFOutline/PDFOutlineControl/CPDFOutlineControl.xaml

@@ -0,0 +1,13 @@
+<UserControl x:Class="compdfkit_tools.PDFView.PDFOutline.PDFOutlineControl.CPDFOutlineControl"
+             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.PDFView.PDFOutline.PDFOutlineControl"
+             xmlns:cpdftoolsui="clr-namespace:compdfkit_tools.PDFControlUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <cpdftoolsui:CPDFOutlineUI x:Name="CPDFOutlineUI"></cpdftoolsui:CPDFOutlineUI>
+    </Grid>
+</UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControls/PDFBrowseModeControl.xaml.cs

@@ -1,5 +1,4 @@
-using ComPDFKitViewer.PdfViewer;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -14,17 +13,23 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace compdfkit_tools.PDFControl
+namespace compdfkit_tools.PDFView.PDFOutline.PDFOutlineControl
 {
     /// <summary>
-    /// PDFBrowseModeControl.xaml 的交互逻辑
+    /// CPDFOutlineControl.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFBrowseModeControl : UserControl
+    public partial class CPDFOutlineControl : UserControl
     {
-        public CPDFViewer pdfViewer;
-        public PDFBrowseModeControl()
+        public CPDFOutlineControl()
         {
             InitializeComponent();
+
+            CPDFOutlineUI.Loaded += CPDFOutlineUI_Loaded;
+        }
+
+        private void CPDFOutlineUI_Loaded(object sender, RoutedEventArgs e)
+        {
+            CPDFOutlineUI.OutlineNodeList = new TreeView();
         }
     }
 }

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFOutline/PDFOutlineUI/CPDFOutlineUI.xaml

@@ -0,0 +1,26 @@
+<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFOutlineUI"
+             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.PDFControlUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="600"
+             d:DesignWidth="300">
+    <Grid>
+        <TreeView x:Name="OutlineNodeList">
+            <TreeView.ItemTemplate>
+                <HierarchicalDataTemplate DataType="CPDFOutlineNode">
+                    <Grid x:Name="OutlineNodeGrid">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition></ColumnDefinition>
+                            <ColumnDefinition Width="auto"></ColumnDefinition>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock x:Name="OutlineName"></TextBlock>
+                        <TextBlock x:Name="PageIndex"></TextBlock>
+                    </Grid>
+                </HierarchicalDataTemplate>
+            </TreeView.ItemTemplate>
+        </TreeView>
+    </Grid>
+</UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFOutline/PDFOutlineUI/CPDFOutlineUI.xaml.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+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.PDFControlUI
+{
+    /// <summary>
+    /// CPDFOutlineUI.xaml 的交互逻辑
+    /// </summary>
+    public partial class CPDFOutlineUI : UserControl
+    {
+        public CPDFOutlineUI()
+        {
+            InitializeComponent();
+        }
+    }
+
+    internal class CPDFOutlineNode
+    {
+        /// <summary>
+        /// 大纲父节点
+        /// </summary>
+        private CPDFOutlineNode parentNode = null;
+
+        /// <summary>
+        /// 当前节点
+        /// </summary>
+        private CPDFOutlineNode currentNode = null;
+
+        /// <summary>
+        /// 大纲子节点
+        /// </summary>
+        private ObservableCollection<CPDFOutlineNode> childNode = null;
+
+        /// <summary>
+        /// 当前展开状态
+        /// </summary>
+        private bool isExpanded = false;
+
+        /// <summary>
+        /// 当前节点页面
+        /// </summary>
+        private int pageIndex = 0;
+
+        /// <summary>
+        /// 当前节点所在页面中的水平位置
+        /// </summary>
+        private double positionX;
+
+        /// <summary>
+        /// 当前节点所在页面中的垂直位置
+        /// </summary>
+        private double positionY;
+
+    }
+}

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFPageTurning/PDFPageTurningControl/PDFPageTurningControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControl.PDFPageTurningControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFPageTurningControl"
              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="120">
     <Grid Height="30" Width="120" >
-        <pdftoolsui:PDFPageTurningUI x:Name="PDFPageTurningUI"></pdftoolsui:PDFPageTurningUI>
+        <pdftoolsui:CPDFPageTurningUI x:Name="CPDFPageTurningUI"></pdftoolsui:CPDFPageTurningUI>
     </Grid>
 </UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFPageTurning/PDFPageTurningControl/PDFPageTurningControl.xaml.cs

@@ -1,4 +1,5 @@
-using ComPDFKitViewer.PdfViewer;
+using compdfkit_tools.PDFControlUI;
+using ComPDFKitViewer.PdfViewer;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -19,17 +20,17 @@ namespace compdfkit_tools.PDFControl
     /// <summary>
     /// PDFPageTurningControl.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFPageTurningControl : UserControl
+    public partial class CPDFPageTurningControl : UserControl
     {
         public CPDFViewer pdfViewer;
 
-        public PDFPageTurningControl()
+        public CPDFPageTurningControl()
         {
             InitializeComponent();
-            PDFPageTurningUI.Loaded += PDFPageTurningUI_Loaded;
+            CPDFPageTurningUI.Loaded += PDFPageTurningUI_Loaded;
         }
 
-        public void SetDocument(CPDFViewer pdfViewer)
+        public void InitWithPDFViewer(CPDFViewer pdfViewer)
         {
             this.pdfViewer = pdfViewer;
             pdfViewer.InfoChanged += PdfViewer_InfoChanged;
@@ -44,16 +45,16 @@ namespace compdfkit_tools.PDFControl
         {
             if (e.Key == "PageNum")
             {
-                PDFPageTurningUI.PageIndex = pdfViewer.CurrentIndex + 1;
+                CPDFPageTurningUI.PageIndex = pdfViewer.CurrentIndex + 1;
             }
         }
 
         private void PDFPageTurningUI_Loaded(object sender, RoutedEventArgs e)
         {
-            PDFPageTurningUI.EnsureKey = Key.Enter;
-            PDFPageTurningUI.GoToSpecificPageEvent += PDFPageTurningUI_GoToSpecificPageEvent;
-            PDFPageTurningUI.GoToNextPageEvent += PDFPageTurningUI_GoToNextPageEvent;
-            PDFPageTurningUI.GoToPreviousPageEvent += PDFPageTurningUI_GoToPreviousPageEvent;
+            CPDFPageTurningUI.EnsureKey = Key.Enter;
+            CPDFPageTurningUI.GoToSpecificPageEvent += PDFPageTurningUI_GoToSpecificPageEvent;
+            CPDFPageTurningUI.GoToNextPageEvent += PDFPageTurningUI_GoToNextPageEvent;
+            CPDFPageTurningUI.GoToPreviousPageEvent += PDFPageTurningUI_GoToPreviousPageEvent;
         }
 
         /// <summary>
@@ -73,7 +74,14 @@ namespace compdfkit_tools.PDFControl
             {
                 return;
             }
-            pdfViewer.GoToPage(pdfViewer.CurrentIndex - 1);
+            if (pdfViewer.ModeView == ComPDFKitViewer.ViewMode.Single || pdfViewer.ModeView == ComPDFKitViewer.ViewMode.SingleContinuous)
+            {
+                pdfViewer.GoToPage(pdfViewer.CurrentIndex - 1);
+            }
+            else
+            {
+                pdfViewer.GoToPage(pdfViewer.CurrentIndex - 2);
+            }
         }
 
         private void PDFPageTurningUI_GoToNextPageEvent(object sender, EventArgs e)
@@ -86,7 +94,15 @@ namespace compdfkit_tools.PDFControl
             {
                 return;
             }
-            pdfViewer.GoToPage(pdfViewer.CurrentIndex + 1);
+
+            if (pdfViewer.ModeView == ComPDFKitViewer.ViewMode.Single || pdfViewer.ModeView == ComPDFKitViewer.ViewMode.SingleContinuous)
+            {
+                pdfViewer.GoToPage(pdfViewer.CurrentIndex + 1);
+            }
+            else
+            {
+                pdfViewer.GoToPage(pdfViewer.CurrentIndex + 2);
+            }
         }
 
         private void PDFPageTurningUI_GoToSpecificPageEvent(object sender, int e)

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFPageTurning/PDFPageTurningUI/PDFPageTurningUI.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControlUI.PDFPageTurningUI"
+<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFPageTurningUI"
              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" 

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFPageTurning/PDFPageTurningUI/PDFPageTurningUI.xaml.cs

@@ -21,7 +21,7 @@ namespace compdfkit_tools.PDFControlUI
     /// <summary>
     /// pdfpageturning.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFPageTurningUI : UserControl, INotifyPropertyChanged
+    public partial class CPDFPageTurningUI : UserControl, INotifyPropertyChanged
     {
         public Key EnsureKey { get; set; }
 
@@ -58,7 +58,7 @@ namespace compdfkit_tools.PDFControlUI
         }
 
 
-        public PDFPageTurningUI()
+        public CPDFPageTurningUI()
         {
             InitializeComponent();
             DataContext = this;

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFScaling/PDFScalingControl/PDFScalingControl.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControl.PDFScalingControl"
+<UserControl x:Class="compdfkit_tools.PDFControl.CPDFScalingControl"
              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="150">
     <Grid Height="30" Width="150">
-        <pdftoolsui:PDFScalingUI x:Name="PDFScalingUI"></pdftoolsui:PDFScalingUI>
+        <pdftoolsui:CPDFScalingUI x:Name="CPDFScalingUI"></pdftoolsui:CPDFScalingUI>
     </Grid>
 </UserControl>

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFScaling/PDFScalingControl/PDFScalingControl.xaml.cs

@@ -19,26 +19,26 @@ namespace compdfkit_tools.PDFControl
     /// <summary>
     /// PDFScallingControl.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFScalingControl : UserControl
+    public partial class CPDFScalingControl : UserControl
     {
         public CPDFViewer pdfViewer;
 
-        public PDFScalingControl()
+        public CPDFScalingControl()
         {
             InitializeComponent();
-            PDFScalingUI.Loaded += PDFScalingControl_Loaded; ;
+            CPDFScalingUI.Loaded += PDFScalingControl_Loaded; ;
         }
 
-        public void SetDocument(CPDFViewer pdfViewer)
+        public void InitWithPDFViewer(CPDFViewer pdfViewer)
         {
             this.pdfViewer = pdfViewer;
         }
 
         private void PDFScalingControl_Loaded(object sender, RoutedEventArgs e)
         {
-            PDFScalingUI.SetScaleEvent += PDFScalingControl_SetScaleEvent;
-            PDFScalingUI.ScaleIncreaseEvent += PDFScalingControl_ScaleIncreaseEvent;
-            PDFScalingUI.ScaleDecreaseEvent += PDFScalingControl_ScaleDecreaseEvent;
+            CPDFScalingUI.SetScaleEvent += PDFScalingControl_SetScaleEvent;
+            CPDFScalingUI.ScaleIncreaseEvent += PDFScalingControl_ScaleIncreaseEvent;
+            CPDFScalingUI.ScaleDecreaseEvent += PDFScalingControl_ScaleDecreaseEvent;
         }
          
         private void PDFScalingControl_ScaleDecreaseEvent(object sender, EventArgs e)
@@ -47,8 +47,8 @@ namespace compdfkit_tools.PDFControl
             {
                 return;
             }
-            PDFScalingUI.Scale -= 25;
-            pdfViewer.Zoom((double)(PDFScalingUI.Scale) / 100);
+            CPDFScalingUI.Scale -= 25;
+            pdfViewer.Zoom((double)(CPDFScalingUI.Scale) / 100);
         }
 
         private void PDFScalingControl_ScaleIncreaseEvent(object sender, EventArgs e)
@@ -57,8 +57,8 @@ namespace compdfkit_tools.PDFControl
             {
                 return;
             }
-            PDFScalingUI.Scale += 25;
-            pdfViewer.Zoom((double)(PDFScalingUI.Scale) / 100);
+            CPDFScalingUI.Scale += 25;
+            pdfViewer.Zoom((double)(CPDFScalingUI.Scale) / 100);
         }
 
         private void PDFScalingControl_SetScaleEvent(object sender, int e)

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFScaling/PDFScalingUI/PDFScalingUI.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="compdfkit_tools.PDFControlUI.PDFScalingUI"
+<UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFScalingUI"
              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" 

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFScaling/PDFScalingUI/PDFScalingUI.xaml.cs

@@ -21,7 +21,7 @@ namespace compdfkit_tools.PDFControlUI
     /// <summary>
     /// PDFScalingControl.xaml 的交互逻辑
     /// </summary>
-    public partial class PDFScalingUI : UserControl, INotifyPropertyChanged
+    public partial class CPDFScalingUI : UserControl, INotifyPropertyChanged
     {
         public CPDFViewer PDFView { get; set; }
 
@@ -43,7 +43,7 @@ namespace compdfkit_tools.PDFControlUI
         public event EventHandler ScaleIncreaseEvent;
         public event EventHandler ScaleDecreaseEvent;
 
-        public PDFScalingUI()
+        public CPDFScalingUI()
         {
             InitializeComponent();
             DataContext = this;

compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFThumbnail/PDFThumbnailUI/CPdfThumbnailUI.xaml

@@ -9,7 +9,6 @@
     <Grid>
         <ListBox Name="ThumbListBox" SelectionChanged="ThumbListBox_SelectionChanged" SelectionMode="Single" ScrollViewer.ScrollChanged="ThumbListBox_ScrollChanged">
             <ListBox.ItemTemplate>
-                
                 <DataTemplate>
                     <StackPanel>
                         <Viewbox Margin="0,5,0,0" Stretch="Uniform" Width="{Binding ThumbnailWidth}" Height="{Binding ThumbnailHeight}">

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

@@ -69,6 +69,18 @@
       <DependentUpon>TitleBarControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Helper\CommonHelper.cs" />
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFBrowseModeControl.xaml.cs">
+      <DependentUpon>CPDFBrowseModeControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PDFView\PDFInfo\CPDFInfoControl.xaml.cs">
+      <DependentUpon>CPDFInfoControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PDFView\PDFOutline\PDFOutlineControl\CPDFOutlineControl.xaml.cs">
+      <DependentUpon>CPDFOutlineControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="PDFView\PDFOutline\PDFOutlineUI\CPDFOutlineUI.xaml.cs">
+      <DependentUpon>CPDFOutlineUI.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PDFView\PDFSearch\PDFSearchUI\CPDFSearchInputUI.xaml.cs">
       <DependentUpon>CPDFSearchInputUI.xaml</DependentUpon>
     </Compile>
@@ -84,26 +96,23 @@
     <Compile Include="PDFView\PDFThumbnail\PDFThumbnailUI\CPdfThumbnailUI.xaml.cs">
       <DependentUpon>CPdfThumbnailUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControls\PDFBrowseModeControl.xaml.cs">
-      <DependentUpon>PDFBrowseModeControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFColorModeControl.xaml.cs">
+      <DependentUpon>CPDFColorModeControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControls\PDFColorModeControl.xaml.cs">
-      <DependentUpon>PDFColorModeControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFInfo\CPDFAbstractInfoControl.xaml.cs">
+      <DependentUpon>CPDFAbstractInfoControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFInfo\PDFAbstractInfoControl.xaml.cs">
-      <DependentUpon>PDFAbstractInfoControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFInfo\CPDFCreateInfoControl.xaml.cs">
+      <DependentUpon>CPDFCreateInfoControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFInfo\PDFCreateInfoControl.xaml.cs">
-      <DependentUpon>PDFCreateInfoControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFInfo\CPDFSecurityInfoControl.xaml.cs">
+      <DependentUpon>CPDFSecurityInfoControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFInfo\PDFSecurityInfoControl.xaml.cs">
-      <DependentUpon>PDFSecurityInfoControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFPageTurning\PDFPageTurningControl\CPDFPageTurningControl.xaml.cs">
+      <DependentUpon>CPDFPageTurningControl.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFPageTurning\PDFPageTurningControl\PDFPageTurningControl.xaml.cs">
-      <DependentUpon>PDFPageTurningControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="PDFView\PDFScaling\PDFScalingControl\PDFScalingControl.xaml.cs">
-      <DependentUpon>PDFScalingControl.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFScaling\PDFScalingControl\CPDFScalingControl.xaml.cs">
+      <DependentUpon>CPDFScalingControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
@@ -118,17 +127,17 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\PDFBrowseModeUI.xaml.cs">
-      <DependentUpon>PDFBrowseModeUI.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFBrowseModeUI.xaml.cs">
+      <DependentUpon>CPDFBrowseModeUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\PDFColorModeUI.xaml.cs">
-      <DependentUpon>PDFColorModeUI.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFColorModeUI.xaml.cs">
+      <DependentUpon>CPDFColorModeUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFPageTurning\PDFPageTurningUI\PDFPageTurningUI.xaml.cs">
-      <DependentUpon>PDFPageTurningUI.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFPageTurning\PDFPageTurningUI\CPDFPageTurningUI.xaml.cs">
+      <DependentUpon>CPDFPageTurningUI.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFView\PDFScaling\PDFScalingUI\PDFScalingUI.xaml.cs">
-      <DependentUpon>PDFScalingUI.xaml</DependentUpon>
+    <Compile Include="PDFView\PDFScaling\PDFScalingUI\CPDFScalingUI.xaml.cs">
+      <DependentUpon>CPDFScalingUI.xaml</DependentUpon>
     </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -139,9 +148,7 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="PDFView\PDFOutline\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Page Include="Asset\Style\MenuItemStyle.xaml">
       <SubType>Designer</SubType>
@@ -156,8 +163,20 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="PDFView\PDFSearch\PDFSearchUI\CPDFSearchInputUI.xaml">
+      <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PDFView\PDFInfo\CPDFInfoControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="PDFView\PDFOutline\PDFOutlineControl\CPDFOutlineControl.xaml">
       <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PDFView\PDFOutline\PDFOutlineUI\CPDFOutlineUI.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Include="PDFView\PDFSearch\PDFSearchUI\CPDFSearchResultUI.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -179,19 +198,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControls\PDFBrowseModeControl.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFBrowseModeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControls\PDFColorModeControl.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsControl\CPDFColorModeControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\PDFBrowseModeUI.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFBrowseModeUI.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\PDFColorModeUI.xaml">
+    <Page Include="PDFView\PDFDisplaySettings\PDFDisplaySettingsUI\CPDFColorModeUI.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -199,31 +218,31 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="PDFView\PDFInfo\PDFAbstractInfoControl.xaml">
+    <Page Include="PDFView\PDFInfo\CPDFAbstractInfoControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFInfo\PDFCreateInfoControl.xaml">
+    <Page Include="PDFView\PDFInfo\CPDFCreateInfoControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFInfo\PDFSecurityInfoControl.xaml">
+    <Page Include="PDFView\PDFInfo\CPDFSecurityInfoControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFPageTurning\PDFPageTurningControl\PDFPageTurningControl.xaml">
+    <Page Include="PDFView\PDFPageTurning\PDFPageTurningControl\CPDFPageTurningControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFPageTurning\PDFPageTurningUI\PDFPageTurningUI.xaml">
+    <Page Include="PDFView\PDFPageTurning\PDFPageTurningUI\CPDFPageTurningUI.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFScaling\PDFScalingControl\PDFScalingControl.xaml">
+    <Page Include="PDFView\PDFScaling\PDFScalingControl\CPDFScalingControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFView\PDFScaling\PDFScalingUI\PDFScalingUI.xaml">
+    <Page Include="PDFView\PDFScaling\PDFScalingUI\CPDFScalingUI.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

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

@@ -5,7 +5,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:viewer_ctrl_demo"
         xmlns:pdftools="clr-namespace:compdfkit_tools.PDFControl;assembly=com.compdfkit.tools"
-        xmlns:custools="clr-namespace:viewer_ctrl_demo.PDFDisplaySettings"
         mc:Ignorable="d"
         Title="MainWindow" Height="960" Width="1280"  WindowStartupLocation="CenterScreen">
 
@@ -53,7 +52,14 @@
                     </ToggleButton.Content>
                 </ToggleButton>
 
-                <ToggleButton  Name="OutlineToolButton" Padding="0,5,0,5" BorderThickness="0" Background="{StaticResource color.bg.jumpbar}" Click="SearchToolButton_Click">
+                <ToggleButton  Name="OutlineToolButton" Height="40" Padding="0,5,0,5" BorderThickness="0" Background="{StaticResource color.bg.jumpbar}" Click="OutlineToolButton_Click">
+                    <ToggleButton.Content>
+                        <Path Width="20" Height="20" Fill="#273C62">
+                            <Path.Data>
+                                M5,14.375 L5,18.125 L1.25,18.125 L1.25,14.375 L5,14.375 Z M18.75,15.625 L18.75,16.875 L7.5,16.875 L7.5,15.625 L18.75,15.625 Z M5,8.125 L5,11.875 L1.25,11.875 L1.25,8.125 L5,8.125 Z M18.75,9.375 L18.75,10.625 L7.5,10.625 L7.5,9.375 L18.75,9.375 Z M5,1.875 L5,5.625 L1.25,5.625 L1.25,1.875 L5,1.875 Z M18.75,3.125 L18.75,4.375 L7.5,4.375 L7.5,3.125 L18.75,3.125 Z
+                            </Path.Data>
+                        </Path>
+                    </ToggleButton.Content>
                 </ToggleButton>
             </StackPanel>
 
@@ -72,13 +78,19 @@
         <!--底部工具栏-->
         <Grid Grid.Row="2" Background="#FFFFFF">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <pdftools:PDFPageTurningControl x:Name="PDFPageTurningControl" Margin="10,0,0,0"></pdftools:PDFPageTurningControl>
-                <pdftools:PDFScalingControl x:Name="PDFScalingControl" Margin="10,0,0,0"></pdftools:PDFScalingControl>
-                <pdftools:PDFBrowseModeControl x:Name="PDFBrowseModeControl" Margin="10,0,0,0"></pdftools:PDFBrowseModeControl>
-                <pdftools:PDFColorModeControl x:Name="PDFColorModeControl" Margin="10,0,0,0"></pdftools:PDFColorModeControl>
-                <ToggleButton x:Name="DocumentInfoToggleButton" Height="30" Width="60"  Margin="10,0,0,0" Click="DocumentInfoToggleButton_Click">
+                <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
+                <pdftools:CPDFPageTurningControl x:Name="CPDFPageTurningControl"></pdftools:CPDFPageTurningControl>
+                <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
+                <pdftools:CPDFScalingControl x:Name="CPDFScalingControl"></pdftools:CPDFScalingControl>
+                <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
+                <pdftools:CPDFBrowseModeControl x:Name="CPDFBrowseModeControl"></pdftools:CPDFBrowseModeControl>
+                <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
+                <pdftools:CPDFColorModeControl x:Name="CPDFColorModeControl"></pdftools:CPDFColorModeControl>
+                <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>
-                </ToggleButton>
+                </Button>
+                <Rectangle Width="1" Fill="#AAAAAA" Margin="5,0,5,0"></Rectangle>
             </StackPanel>
             <Border BorderBrush="{StaticResource color.border.normal}" BorderThickness="1"></Border>
         </Grid>

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

@@ -1,6 +1,7 @@
 using ComPDFKit.PDFDocument;
 using compdfkit_tools;
 using compdfkit_tools.PDFControl;
+using compdfkit_tools.PDFControl;
 using compdfkit_tools.PDFControlUI;
 using ComPDFKitViewer.PdfViewer;
 using Microsoft.Win32;
@@ -19,9 +20,6 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using viewer_ctrl_demo.PDFDocumetInfo;
-
-
 
 namespace viewer_ctrl_demo
 {
@@ -46,9 +44,10 @@ namespace viewer_ctrl_demo
             pdfViewer.Load();
             PDFGrid.Child = pdfViewer;
 
-            PDFScalingControl.SetDocument(pdfViewer);
-            PDFPageTurningControl.SetDocument(pdfViewer);
-
+            CPDFScalingControl.InitWithPDFViewer(pdfViewer);
+            CPDFPageTurningControl.InitWithPDFViewer(pdfViewer);
+            CPDFBrowseModeControl.InitWithPDFViewer(pdfViewer);
+            CPDFColorModeControl.InitWithPDFViewer(pdfViewer);
 
             UIElement currentBotaTool = GetBotaTool();
             if (currentBotaTool is CPDFSearchControl)
@@ -83,32 +82,6 @@ namespace viewer_ctrl_demo
             LoadDocument();
         }
 
-        #region PageTurning
-
-
-        #endregion
-
-
-        /// <summary>
-        /// Get file path from system file browse dialog
-        /// </summary>
-        /// <returns>
-        /// success: file path
-        /// failure: string.empty
-        /// </returns>
-        public string GetFilePathOrEmpty()
-        {
-            string selectedFilePath = string.Empty;
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Filter = "PDF files (*.pdf)|*.pdf";
-
-            if (openFileDialog.ShowDialog() == true)
-            {
-                selectedFilePath = openFileDialog.FileName;
-            }
-            return selectedFilePath;
-        }
-
         private void LogoButton_Click(object sender, RoutedEventArgs e)
         {
             Button button = sender as Button;
@@ -162,6 +135,17 @@ namespace viewer_ctrl_demo
             ClearToolState(ThumbToolButton);
         }
 
+        /// <summary>
+        /// 大纲列表处理
+        /// </summary>
+        private void OutlineToolButton_Click(object sender, RoutedEventArgs e)
+        {
+            UIElement botaTool = GetBotaTool();
+            if (botaTool == null||!(botaTool is CPDFOutline))
+            {
+
+            }
+        }
         /// <summary>
         /// 设置Bota工具内容
         /// </summary>
@@ -204,15 +188,27 @@ namespace viewer_ctrl_demo
             }
         }
 
-        private void DocumentInfoToggleButton_Click(object sender, RoutedEventArgs e)
+        private void ShowPDFInfoDialog()
+        {
+            CPDFInfoControl pdfInfoControl = new CPDFInfoControl();
+            pdfInfoControl.PDFDocument = pdfViewer.Document;
+            Window dialog = new Window
+            {
+                Title = "PDF Info", // 设置弹出窗口的标题
+                Content = pdfInfoControl, // 将UserControl添加到弹出窗口中
+                Width = 600, // 设置弹出窗口的宽度
+                Height = 300, // 设置弹出窗口的高度
+                ResizeMode = ResizeMode.NoResize, // 禁止用户调整弹出窗口的大小
+                WindowStartupLocation = WindowStartupLocation.CenterScreen, // 将弹出窗口显示在屏幕中央
+                WindowStyle = WindowStyle.ToolWindow, // 设置弹出窗口的样式
+                Owner = Application.Current.MainWindow // 将主窗口设置为弹出窗口的拥有者
+            };
+            dialog.ShowDialog(); // 显示弹出窗口
+        }
+
+        private void PDFInfoButton_Click(object sender, RoutedEventArgs e)
         {
-            Window pdfDocumentInfoWindow = new Window();
-            PDFDocumentInfoControl pdfDocumentInfoControl = new PDFDocumentInfoControl();
-            pdfDocumentInfoControl.PDFDocument = this.pdfViewer.Document;
-            pdfDocumentInfoWindow.Content = pdfDocumentInfoControl;
-            pdfDocumentInfoWindow.Width = 600;
-            pdfDocumentInfoWindow.Height = 260;
-            pdfDocumentInfoWindow.ShowDialog();
+            ShowPDFInfoDialog();
         }
     }
 }

compdfkit_demo_windows/compdfkit/viewer-ctrl-demo/PDFDocumetInfo/PDFDocumentInfoControl.xaml

@@ -1,17 +0,0 @@
-<UserControl x:Class="viewer_ctrl_demo.PDFDocumetInfo.PDFDocumentInfoControl"
-             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.PDFDocumetInfo"
-             xmlns:tools="clr-namespace:compdfkit_tools;assembly=com.compdfkit.tools"
-             mc:Ignorable="d" 
-             d:DesignHeight="240" d:DesignWidth="600">
-    <Grid>
-        <StackPanel Orientation="Horizontal">
-            <tools:PDFAbstractInfoControl x:Name="PDFAbstractInfoControl" Width="200"></tools:PDFAbstractInfoControl>
-            <tools:PDFCreateInfoControl x:Name="PDFCreateInfoControl" Width="200"></tools:PDFCreateInfoControl>
-            <tools:PDFSecurityInfoControl x:Name="PDFSecurityInfoControl" Width="200"></tools:PDFSecurityInfoControl>
-        </StackPanel>
-    </Grid>
-</UserControl>

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

@@ -1,5 +1,4 @@
-using compdfkit_tools;
-using ComPDFKitViewer.PdfViewer;
+using ComPDFKitViewer.PdfViewer;
 using System;
 using System.Collections.Generic;
 using System.Linq;

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

@@ -77,18 +77,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="PDFDocumetInfo\PDFDocumentInfoControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="PDFDisplaySettings\PDFDisplaySettings.xaml.cs">
       <DependentUpon>PDFDisplaySettings.xaml</DependentUpon>
     </Compile>
-    <Compile Include="PDFDocumetInfo\PDFDocumentInfoControl.xaml.cs">
-      <DependentUpon>PDFDocumentInfoControl.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -120,7 +113,7 @@
       <Name>compdfkit-assets</Name>
     </ProjectReference>
     <ProjectReference Include="..\compdfkit-tools\compdfkit-tools.csproj">
-      <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
+      <Project>{9363BCB1-3A67-446A-8093-5708B86BF418}</Project>
       <Name>compdfkit-tools</Name>
     </ProjectReference>
   </ItemGroup>