Skip to content

Commit 2edcea0

Browse files
youna12345youna12345
committed
Windows - v2.0.0 update
1 parent 7829103 commit 2edcea0

File tree

884 files changed

+161968
-17245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

884 files changed

+161968
-17245
lines changed

‎ComPDFKit for Windows/Examples/Annotations/Annotations.csproj

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@
4141
<ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="ComPDFKit.Desk, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\ComPDFKit.NetFramework.1.13.0\lib\ComPDFKit.Desk.dll</HintPath>
44+
<ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
45+
<Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
46+
<Name>Compdfkit.Controls</Name>
47+
</ProjectReference>
48+
<Reference Include="ComPDFKit.NET, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\ComPDFKit.NetFramework.2.0.0\lib\ComPDFKit.NET.dll</HintPath>
4650
</Reference>
47-
<Reference Include="ComPDFKit.Viewer, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\ComPDFKit.NetFramework.1.13.0\lib\ComPDFKit.Viewer.dll</HintPath>
51+
<Reference Include="ComPDFKit.Viewer, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\ComPDFKit.NetFramework.2.0.0\lib\ComPDFKit.Viewer.dll</HintPath>
4953
</Reference>
5054
<Reference Include="PresentationFramework.Aero2, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5155
<HintPath>..\packages\PresentationFramework.Aero2.1.0.1\lib\PresentationFramework.Aero2.dll</HintPath>
@@ -100,9 +104,13 @@
100104
<None Include="packages.config" />
101105
</ItemGroup>
102106
<ItemGroup>
103-
<ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
107+
<ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
104108
<Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
105-
<Name>Compdfkit_Tools</Name>
109+
<Name>Compdfkit.Controls</Name>
110+
</ProjectReference>
111+
<ProjectReference Include="..\ComPDFKit.Tool\ComPDFKit.Tool.csproj">
112+
<Project>{a061ee7a-6704-4bd9-86ee-48ed5df75e2f}</Project>
113+
<Name>ComPDFKit.Tool</Name>
106114
</ProjectReference>
107115
</ItemGroup>
108116
<ItemGroup>
@@ -119,11 +127,11 @@
119127
</Content>
120128
</ItemGroup>
121129
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
122-
<Import Project="..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets')" />
130+
<Import Project="..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets')" />
123131
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
124132
<PropertyGroup>
125-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
133+
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
126134
</PropertyGroup>
127-
<Error Condition="!Exists('..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets'))" />
135+
<Error Condition="!Exists('..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets'))" />
128136
</Target>
129137
</Project>

‎ComPDFKit for Windows/Examples/Annotations/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Globalization;
22
using ComPDFKit.NativeMethod;
3-
using Compdfkit_Tools.Helper;
3+
using ComPDFKit.Controls.Helper;
44
using System.Reflection;
55
using System.Threading;
66
using System.Windows;

‎ComPDFKit for Windows/Examples/Annotations/MainWindow.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:AnnotationViewControl"
7-
xmlns:pdfControl="clr-namespace:Compdfkit_Tools.PDFControl;assembly=ComPDFKit_Tools"
8-
xmlns:common="clr-namespace:Compdfkit_Tools.Common;assembly=ComPDFKit_Tools"
7+
xmlns:pdfControl="clr-namespace:ComPDFKit.Controls.PDFControl;assembly=ComPDFKit.Controls"
8+
xmlns:common="clr-namespace:ComPDFKit.Controls.Common;assembly=ComPDFKit.Controls"
99
mc:Ignorable="d"
1010
Loaded="MainWindow_Loaded"
1111
Title="{Binding AppInfo}" Height="720" Width="1080" WindowStartupLocation="CenterScreen">
1212
<Window.Resources>
1313
<ResourceDictionary>
1414
<ResourceDictionary.MergedDictionaries>
15-
<ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
16-
<ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
17-
<ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
15+
<ResourceDictionary Source="pack://application:,,,/ComPDFKit.Controls;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
16+
<ResourceDictionary Source="pack://application:,,,/ComPDFKit.Controls;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
17+
<ResourceDictionary Source="pack://application:,,,/ComPDFKit.Controls;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
1818
</ResourceDictionary.MergedDictionaries>
1919
<common:DocInfoResourceConverter x:Key="DocInfoResourceConverter"></common:DocInfoResourceConverter>
2020
</ResourceDictionary>

0 commit comments

Comments
 (0)