Browse Source

CPDFCommon(windows) - Converter命名空间调整

liuaoran 1 year ago
parent
commit
67345350bc

+ 1 - 0
compdfkit_demo_windows/compdfkit/compdfkit-tools/Annotation/PDFAnnotationList/PDFAnnotationListControl/CPDFAnnotationListControl.xaml.cs

@@ -50,6 +50,7 @@ namespace compdfkit_tools.PDFControl
         {
             if (e != null)
             {
+                //TODO SomeThing Need Change
               int a =  e.GetAnnotHandlerEventArgs(e.GetAnnotTypes())[0].AnnotIndex;
               int b =  e.GetAnnotHandlerEventArgs(e.GetAnnotTypes())[0].PageIndex;
 

+ 2 - 2
compdfkit_demo_windows/compdfkit/compdfkit-tools/Annotation/PDFAnnotationList/PDFAnnotationListUI/CPDFAnnoationListUI.xaml

@@ -1,8 +1,8 @@
 <UserControl x:Class="compdfkit_tools.PDFControlUI.CPDFAnnoationListUI"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:cpdfcommon="clr-namespace:compdfkit_tools.Common"
              mc:Ignorable="d" 
               d:DesignHeight="800" d:DesignWidth="300">

+ 3 - 1
compdfkit_demo_windows/compdfkit/compdfkit-tools/Annotation/PDFAnnotationPanel/PDFAnnotationUI/CPDFCreateSignatureDialog.xaml

@@ -3,7 +3,9 @@
         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:compdfkit_tools.Annotation.PDFAnnotationPanel.PDFAnnotationUI" xmlns:convert="clr-namespace:compdfkit_tools.Common.Convert" xmlns:common="clr-namespace:compdfkit_tools.Common"
+        xmlns:local="clr-namespace:compdfkit_tools.Annotation.PDFAnnotationPanel.PDFAnnotationUI"
+        xmlns:convert="clr-namespace:compdfkit_tools.Common" 
+        xmlns:common="clr-namespace:compdfkit_tools.Common"
         mc:Ignorable="d"
         AllowsTransparency="True" 
         WindowStyle="None"

+ 2 - 2
compdfkit_demo_windows/compdfkit/compdfkit-tools/Annotation/PDFAnnotationPanel/PDFAnnotationUI/CPDFCreateStampDialog.xaml

@@ -3,7 +3,7 @@
         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:compdfkit_tools.Annotation.PDFAnnotationPanel.PDFAnnotationUI" xmlns:convert="clr-namespace:compdfkit_tools.Common.Convert"
+        xmlns:local="clr-namespace:compdfkit_tools.Annotation.PDFAnnotationPanel.PDFAnnotationUI" xmlns:cpdfcommon="clr-namespace:compdfkit_tools.Common"
         mc:Ignorable="d"
         AllowsTransparency="True" 
         WindowStyle="None"
@@ -16,7 +16,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/compdfkit-assets;component/Styles/ButtonStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
-            <convert:ReverseVisibilityConvert x:Key="ReverseVisibilityConvert"/>
+            <cpdfcommon:ReverseVisibilityConvert x:Key="ReverseVisibilityConvert"/>
             <SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
             <SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
             <Style x:Key="TabControlStyle1" TargetType="{x:Type TabControl}">

+ 3 - 3
compdfkit_demo_windows/compdfkit/compdfkit-tools/Common/BaseControl/DropDownNumberBoxControl.xaml

@@ -3,12 +3,12 @@
              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"
+             xmlns:cpdfcommon="clr-namespace:compdfkit_tools.Common"
              mc:Ignorable="d" 
              d:DesignHeight="30" d:DesignWidth="100">
     <UserControl.Resources>
-        <local:BoolToVisibleConverter x:Key="BoolToVisibleConverter"></local:BoolToVisibleConverter>
-        <local:BoolToCollapsedConverter x:Key="BoolToCollapsedConverter"></local:BoolToCollapsedConverter>
+        <cpdfcommon:BoolToVisibleConverter x:Key="BoolToVisibleConverter"></cpdfcommon:BoolToVisibleConverter>
+        <cpdfcommon:BoolToCollapsedConverter x:Key="BoolToCollapsedConverter"></cpdfcommon:BoolToCollapsedConverter>
         <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
         <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="#FF7EB4EA"/>
         <SolidColorBrush x:Key="TextBox.Focus.Border" Color="#FF569DE5"/>

+ 1 - 1
compdfkit_demo_windows/compdfkit/compdfkit-tools/Common/Convert/IntAndTagToBoolMultiBinding.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace compdfkit_tools.Common.Convert
+namespace compdfkit_tools.Common
 {
     class IntAndTagToBoolMultiBinding : IMultiValueConverter
     {

+ 1 - 1
compdfkit_demo_windows/compdfkit/compdfkit-tools/Common/Convert/ReverseVisibilityConvert.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
-namespace compdfkit_tools.Common.Convert
+namespace compdfkit_tools.Common
 {
     public class ReverseVisibilityConvert : IValueConverter
     {

+ 2 - 2
compdfkit_demo_windows/compdfkit/compdfkit-tools/Common/PropertyControl/ColorPickerControl.xaml

@@ -4,10 +4,10 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
-             xmlns:local="clr-namespace:compdfkit_tools.Common" xmlns:convert="clr-namespace:compdfkit_tools.Common.Convert"
+             xmlns:local="clr-namespace:compdfkit_tools.Common"
              d:DesignHeight="40" d:DesignWidth="220">
     <UserControl.Resources>
-        <convert:ReverseVisibilityConvert x:Key="ReverseVisibilityConvert"/>
+        <local:ReverseVisibilityConvert x:Key="ReverseVisibilityConvert"/>
         <Style x:Key="TransparentRadioButton" TargetType="{x:Type RadioButton}">
             <Setter Property="HorizontalAlignment" Value="Center" />
             <Setter Property="VerticalAlignment" Value="Center" />

+ 1 - 1
compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFScaling/PDFScalingUI/CPDFScalingUI.xaml

@@ -22,7 +22,7 @@
             <ColumnDefinition Width="17"/>
         </Grid.ColumnDefinitions>
         <StackPanel Orientation="Horizontal" Height="30">
-            <cpdfcommon:DropDownNumberBoxControl x:Name="DropDownNumberBoxControl" Height="30" Width=" 72" Unit="%" Maxium="1600" Minimum="0" Text="{Binding Scale,Mode=TwoWay}"></cpdfcommon:DropDownNumberBoxControl>
+            <cpdfcommon:DropDownNumberBoxControl x:Name="DropDownNumberBoxControl" Height="30" Width=" 72" Maxium="1600" Minimum="0" Text="{Binding Scale,Mode=TwoWay}"></cpdfcommon:DropDownNumberBoxControl>
         </StackPanel>
         <StackPanel Grid.Column="1" Orientation="Horizontal" Grid.ColumnSpan="2">
             <Button x:Name="ScaleDecreaseButton" Style="{StaticResource LightButtonStyle}" Height="30" Width="30" Margin="20,0,0,0" Background="Transparent" BorderThickness="0" Click="ScaleDecreaseButton_Click">