Skip to content

Commit b74356d

Browse files
947956
1 parent fc6f5c6 commit b74356d

Some content is hidden

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

55 files changed

+654
-109
lines changed
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
55
</startup>
6+
67
</configuration>

Toolbar/CustomToolbar/CustomToolbar/CustomToolbar.csproj renamed to Toolbar/CustomToolbar/CustomToolbar.csproj

Lines changed: 8 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DebugType>full</DebugType>
2222
<Optimize>false</Optimize>
2323
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24+
<DefineConstants>DEBUG;TRACE;FRAMEWORK</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
2727
<Prefer32Bit>false</Prefer32Bit>
@@ -31,43 +31,15 @@
3131
<DebugType>pdbonly</DebugType>
3232
<Optimize>true</Optimize>
3333
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
34+
<DefineConstants>TRACE;FRAMEWORK</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Syncfusion.Compression.Base">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.Compression.Base.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Syncfusion.Licensing">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.Licensing.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Syncfusion.Pdf.Base">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.Pdf.Base.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Syncfusion.PdfViewer.WPF">
52-
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.PdfViewer.WPF.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Syncfusion.SfSkinManager.WPF">
56-
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.SfSkinManager.WPF.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Syncfusion.Shared.Wpf">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.Shared.Wpf.dll</HintPath>
62-
</Reference>
63-
<Reference Include="Syncfusion.Themes.Office2019Colorful.WPF">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.Themes.Office2019Colorful.WPF.dll</HintPath>
66-
</Reference>
67-
<Reference Include="Syncfusion.Tools.WPF">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\..\..\..\..\..\..\Assemblies\Syncfusion.Tools.WPF.dll</HintPath>
70-
</Reference>
39+
<PackageReference Include="Syncfusion.PdfViewer.WPF" Version="*" />
40+
<PackageReference Include="Syncfusion.SfSkinManager.WPF" Version="*"/>
41+
<PackageReference Include="Syncfusion.Themes.Office2019Colorful.WPF" Version="*"/>
42+
<PackageReference Include="Syncfusion.Tools.WPF" Version="*"/>
7143
<Reference Include="System" />
7244
<Reference Include="System.Data" />
7345
<Reference Include="System.Windows.Controls.Ribbon" />
@@ -122,6 +94,7 @@
12294
<Generator>ResXFileCodeGenerator</Generator>
12395
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
12496
</EmbeddedResource>
97+
<None Include="Data\F# Succinctly.pdf" />
12598
<None Include="Properties\Settings.settings">
12699
<Generator>SettingsSingleFileGenerator</Generator>
127100
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -131,39 +104,7 @@
131104
<None Include="App.config" />
132105
</ItemGroup>
133106
<ItemGroup>
134-
<Resource Include="Icon\Data-Find.png" />
135-
<Resource Include="Icon\Fit-To-Size.png" />
136-
<Resource Include="Icon\Folder-Open-01.png" />
137-
<Resource Include="Icon\Folder-Open.png" />
138-
<Resource Include="Icon\Icons_Backward.png" />
139-
<Resource Include="Icon\Icons_FitPage.png" />
140-
<Resource Include="Icon\Icons_FitWidth.png" />
141-
<Resource Include="Icon\Icons_Forward.png" />
142-
<Resource Include="Icon\Icons_Front.png" />
143-
<Resource Include="Icon\Icons_Last.png" />
144-
<Resource Include="Icon\Icons_Open.png" />
145-
<Resource Include="Icon\Icons_Print.png" />
146-
<Resource Include="Icon\Icons_Save.png" />
147-
<Resource Include="Icon\Icons_Search.png" />
148-
<Resource Include="Icon\Icons_Stamp.png" />
149-
<Resource Include="Icon\Icons_Zoom In.png" />
150-
<Resource Include="Icon\Icons_Zoom Out.png" />
151-
<Resource Include="Icon\Media Fast-forward.png" />
152-
<Resource Include="Icon\Media Next.png" />
153-
<Resource Include="Icon\Media Previous.png" />
154-
<Resource Include="Icon\Media Rewind.png" />
155-
<Resource Include="Icon\Open32.png" />
156-
<Resource Include="Icon\OpenFile.png" />
157-
<Resource Include="Icon\openHS.png" />
158-
<Resource Include="Icon\PrintArea.png" />
159-
<Resource Include="Icon\Printer New.png" />
160-
<Resource Include="Icon\PrintHS.png" />
161-
<Resource Include="Icon\Save As.png" />
162-
<Resource Include="Icon\SaveAs32.png" />
163-
<Resource Include="Icon\saveHS.png" />
164-
<Resource Include="Icon\Scale-To-Fit.png" />
165-
<Resource Include="Icon\Zoom-In.png" />
166-
<Resource Include="Icon\Zoom-Out.png" />
107+
<Resource Include="Data\PdfViewer\Approved.png" />
167108
</ItemGroup>
168109
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
169110
</Project>
Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30804.86
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.5.2.0
54
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomToolbar", "CustomToolbar\CustomToolbar.csproj", "{6AC69A74-7539-4C2C-BDFD-F436674A7FBD}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomToolbar", "CustomToolbar.csproj", "{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}"
76
EndProject
87
Global
98
GlobalSection(SolutionConfigurationPlatforms) = preSolution
109
Debug|Any CPU = Debug|Any CPU
1110
Release|Any CPU = Release|Any CPU
12-
Release-Xml|Any CPU = Release-Xml|Any CPU
1311
EndGlobalSection
1412
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15-
{6AC69A74-7539-4C2C-BDFD-F436674A7FBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
16-
{6AC69A74-7539-4C2C-BDFD-F436674A7FBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
17-
{6AC69A74-7539-4C2C-BDFD-F436674A7FBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
18-
{6AC69A74-7539-4C2C-BDFD-F436674A7FBD}.Release|Any CPU.Build.0 = Release|Any CPU
19-
{6AC69A74-7539-4C2C-BDFD-F436674A7FBD}.Release-Xml|Any CPU.ActiveCfg = Release|Any CPU
20-
{6AC69A74-7539-4C2C-BDFD-F436674A7FBD}.Release-Xml|Any CPU.Build.0 = Release|Any CPU
13+
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14+
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Debug|Any CPU.Build.0 = Debug|Any CPU
15+
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Release|Any CPU.ActiveCfg = Release|Any CPU
16+
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Release|Any CPU.Build.0 = Release|Any CPU
2117
EndGlobalSection
2218
GlobalSection(SolutionProperties) = preSolution
2319
HideSolutionNode = FALSE
2420
EndGlobalSection
2521
GlobalSection(ExtensibilityGlobals) = postSolution
26-
SolutionGuid = {7DED6731-AC5D-4C1B-8058-DCD4D383B3E3}
22+
SolutionGuid = {E4AE6383-1A5C-46C2-93BE-A60C75360BC0}
2723
EndGlobalSection
2824
EndGlobal

Toolbar/CustomToolbar/CustomToolbar/CustomToolbar.csproj.user

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
<PropertyGroup>
3+
<OutputType>WinExe</OutputType>
4+
<TargetFramework>net8.0-Windows</TargetFramework>
5+
<UseWPF>true</UseWPF>
6+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
7+
<RootNamespace>CustomToolbar</RootNamespace>
8+
<AssemblyName>CustomToolbar</AssemblyName>
9+
</PropertyGroup>
10+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
11+
<DefineConstants>TRACE;NETCORE</DefineConstants>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
14+
<DefineConstants>TRACE;NETCORE</DefineConstants>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<PackageReference Include="Syncfusion.PdfViewer.WPF" Version="*" />
18+
<PackageReference Include="Syncfusion.SfSkinManager.WPF" Version="*"/>
19+
<PackageReference Include="Syncfusion.Themes.Office2019Colorful.WPF" Version="*"/>
20+
<PackageReference Include="Syncfusion.Tools.WPF" Version="*"/>
21+
</ItemGroup>
22+
<ItemGroup>
23+
<None Include="App.config" />
24+
</ItemGroup>
25+
<ItemGroup>
26+
<Resource Include="Data\PdfViewer\Approved.png" />
27+
<Resource Include="Data\F# Succinctly.pdf" />
28+
</ItemGroup>
29+
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1+
12
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio Version 17
3-
VisualStudioVersion = 17.5.2.0
4+
VisualStudioVersion = 17.8.226.21692
45
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomToolbar", "CustomToolbar.csproj", "{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomToolbar", "CustomToolbar_NET.csproj", "{A9693914-16B8-4605-BAF9-69C6FFE4ABB0}"
67
EndProject
78
Global
89
GlobalSection(SolutionConfigurationPlatforms) = preSolution
910
Debug|Any CPU = Debug|Any CPU
1011
Release|Any CPU = Release|Any CPU
1112
EndGlobalSection
1213
GlobalSection(ProjectConfigurationPlatforms) = postSolution
13-
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
14-
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Debug|Any CPU.Build.0 = Debug|Any CPU
15-
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Release|Any CPU.ActiveCfg = Release|Any CPU
16-
{BDB4645E-EC1F-6D00-4FE7-2C6AB5166375}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{A9693914-16B8-4605-BAF9-69C6FFE4ABB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{A9693914-16B8-4605-BAF9-69C6FFE4ABB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{A9693914-16B8-4605-BAF9-69C6FFE4ABB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{A9693914-16B8-4605-BAF9-69C6FFE4ABB0}.Release|Any CPU.Build.0 = Release|Any CPU
1718
EndGlobalSection
1819
GlobalSection(SolutionProperties) = preSolution
1920
HideSolutionNode = FALSE
2021
EndGlobalSection
2122
GlobalSection(ExtensibilityGlobals) = postSolution
22-
SolutionGuid = {E4AE6383-1A5C-46C2-93BE-A60C75360BC0}
23+
SolutionGuid = {CBF28B5B-1546-4921-BF24-226CA1F9ED89}
2324
EndGlobalSection
2425
EndGlobal
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)