2.2.15-alpha (#47)

* 2.2.15-alpha
Panuon · Dec 3, 2021 · faaf8cc · faaf8cc
1 parent 15c3855
commit faaf8cc
Show file tree

Hide file tree

Showing 92 changed files with 4,360 additions and 721 deletions.
diff --git a/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Panuon.UI.Silver.csproj b/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Panuon.UI.Silver.csproj
@@ -20,15 +20,19 @@
   <Import Project="..\..\SharedResources\Panuon.UI.Silver\Panuon.UI.Silver.projitems" Label="Shared" />
 
   <ItemGroup>
+    <None Remove="Resources\dropper.cur" />
     <None Remove="Resources\Fonts\PanuonIcon.ttf" />
+    <None Remove="Resources\PanuonIcon.ttf" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Panuon.UI.Core\Panuon.UI.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Resources\dropper.cur" />
     <Resource Include="Resources\Fonts\PanuonIcon.ttf" />
+    <Resource Include="Resources\PanuonIcon.ttf" />
   </ItemGroup>
 
 </Project>
diff --git a/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/PanuonIcon.ttf
diff --git a/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/dropper.cur b/DotNet/WPF/Src/Core31/Panuon.UI.Silver/Resources/dropper.cur
diff --git a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Panuon.UI.Silver.csproj b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Panuon.UI.Silver.csproj
@@ -69,6 +69,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <Resource Include="Resources\PanuonIcon.ttf" />
     <Resource Include="Resources\Fonts\PanuonIcon.ttf" />
   </ItemGroup>
   <ItemGroup>
@@ -83,6 +84,9 @@
       <Name>Panuon.UI.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\dropper.cur" />
+  </ItemGroup>
   <Import Project="..\..\SharedResources\Panuon.UI.Silver\Panuon.UI.Silver.projitems" Label="Shared" />
   <Import Project="..\..\SharedResources\Panuon.UI.Silver.Internal\Panuon.UI.Silver.Internal.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/PanuonIcon.ttf
diff --git a/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/dropper.cur b/DotNet/WPF/Src/Net40/Panuon.UI.Silver/Resources/dropper.cur
diff --git a/DotNet/WPF/Src/Net45/Panuon.UI.Core/Panuon.UI.Core.csproj b/DotNet/WPF/Src/Net45/Panuon.UI.Core/Panuon.UI.Core.csproj
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\Outputs\Release\Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

diff --git a/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Panuon.UI.Silver.csproj b/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Panuon.UI.Silver.csproj
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\Outputs\Release\Net45\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -66,6 +66,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <Resource Include="Resources\PanuonIcon.ttf" />
     <Resource Include="Resources\Fonts\PanuonIcon.ttf" />
   </ItemGroup>
   <ItemGroup>
@@ -80,6 +81,9 @@
       <Name>Panuon.UI.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\dropper.cur" />
+  </ItemGroup>
   <Import Project="..\..\SharedResources\Panuon.UI.Silver\Panuon.UI.Silver.projitems" Label="Shared" />
   <Import Project="..\..\SharedResources\Panuon.UI.Silver.Internal\Panuon.UI.Silver.Internal.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/PanuonIcon.ttf
diff --git a/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/dropper.cur b/DotNet/WPF/Src/Net45/Panuon.UI.Silver/Resources/dropper.cur
diff --git a/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Panuon.UI.Silver.csproj b/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Panuon.UI.Silver.csproj
@@ -72,6 +72,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <Resource Include="Resources\PanuonIcon.ttf" />
     <Resource Include="Resources\Fonts\PanuonIcon.ttf" />
   </ItemGroup>
   <ItemGroup>
@@ -80,6 +81,9 @@
       <Name>Panuon.UI.Core</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\dropper.cur" />
+  </ItemGroup>
   <Import Project="..\..\SharedResources\Panuon.UI.Silver\Panuon.UI.Silver.projitems" Label="Shared" />
   <Import Project="..\..\SharedResources\Panuon.UI.Silver.Internal\Panuon.UI.Silver.Internal.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/PanuonIcon.ttf b/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/PanuonIcon.ttf
diff --git a/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/dropper.cur b/DotNet/WPF/Src/Net472/Panuon.UI.Silver/Resources/dropper.cur
diff --git a/DotNet/WPF/Src/Samples/App.xaml b/DotNet/WPF/Src/Samples/App.xaml
@@ -11,6 +11,17 @@
                 <ResourceDictionary>
 
                     <pu:MessageBoxXSettings x:Key="messageSetting">
+                        <pu:MessageBoxXSettings.WindowXStyle>
+                            <Style TargetType="pu:WindowX"
+                                   BasedOn="{StaticResource {ComponentResourceKey ResourceId=WindowXStyle, TypeInTargetAssembly={x:Type pu:MessageBoxX}}}">
+                                <Setter Property="SizeToContent"
+                                        Value="Manual" />
+                                <Setter Property="Width"
+                                        Value="400" />
+                                <Setter Property="Height"
+                                        Value="200" />
+                            </Style>
+                        </pu:MessageBoxXSettings.WindowXStyle>
                         <pu:MessageBoxXSettings.ButtonStyle>
                             <Style TargetType="Button"
                                    BasedOn="{StaticResource {ComponentResourceKey ResourceId=ButtonStyle, TypeInTargetAssembly={x:Type pu:MessageBoxX}}}">

diff --git a/DotNet/WPF/Src/Samples/Resources/Logo.png b/DotNet/WPF/Src/Samples/Resources/Logo.png