1.2.0

Panuon · Mar 11, 2024 · 21a5f1f · 21a5f1f
1 parent dce2672
commit 21a5f1f
Show file tree

Hide file tree

Showing 335 changed files with 1,731 additions and 3,262 deletions.
diff --git a/Samples/App.xaml b/Samples/App.xaml
@@ -126,8 +126,9 @@
                         </pu:GlobalSettings.Themes>
                     </pu:GlobalSettings>
                 </ResourceDictionary>
-                <!--<ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />-->
-                <ResourceDictionary Source="{x:Static pu:ResourceDictionaryUris.All}" />
+
+                <pu:StyleDictionary Includes="All" />
+
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/Samples/Views/Examples/FormView.xaml b/Samples/Views/Examples/FormView.xaml
@@ -4,8 +4,8 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:local="clr-namespace:Samples.Views.Examples"
-            xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
-            xmlns:purs="clr-namespace:Panuon.WPF.UI.Resources;assembly=Panuon.WPF.UI"
+            xmlns:pw="https://opensource.panuon.com/wpf"
+            xmlns:pu="https://opensource.panuon.com/wpf-ui"
             mc:Ignorable="d"
             Title="Form"
             SizeToContent="Height"
@@ -229,7 +229,7 @@
                                 <DataTemplate>
                                     <Grid RenderTransformOrigin="0.5,0.5">
                                         <Grid.RenderTransform>
-                                            <RotateTransform Angle="{Binding Value, Converter={StaticResource {x:Static purs:ConverterKeys.DoublePowConverter}}, ConverterParameter=1.3, RelativeSource={RelativeSource AncestorType=Slider}, Mode=OneWay}" />
+                                            <RotateTransform Angle="{Binding Value, Converter={x:Static pw:Converters.DoublePowConverter}, ConverterParameter=1.3, RelativeSource={RelativeSource AncestorType=Slider}, Mode=OneWay}" />
                                         </Grid.RenderTransform>
                                         <TextBlock Text="&#xe958;"
                                                    FontSize="20"

diff --git a/Samples/Views/MainView.xaml b/Samples/Views/MainView.xaml
@@ -4,6 +4,7 @@
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:local="clr-namespace:Samples.Views"
+            xmlns:pw="https://opensource.panuon.com/wpf"
             xmlns:pu="https://opensource.panuon.com/wpf-ui"
             mc:Ignorable="d"
             Title="MainView"
@@ -89,7 +90,7 @@
                                 <pu:Card Margin="0,0,10,10"
                                          BorderThickness="0"
                                          Background="Transparent"
-                                         Width="{Binding ActualHeight, Converter={StaticResource {x:Static pu:ConverterKeys.DoublePlusConverter}}, ConverterParameter=100, RelativeSource={RelativeSource Self}, Mode=OneWay}"
+                                         Width="{Binding ActualHeight, Converter={x:Static pw:Converters.DoublePlusConverter}, ConverterParameter=100, RelativeSource={RelativeSource Self}, Mode=OneWay}"
                                          ToolTip="{Binding ViewPath}"
                                          VerticalContentAlignment="Stretch"
                                          HorizontalContentAlignment="Stretch"

diff --git a/Samples/Views/MainView.xaml.cs b/Samples/Views/MainView.xaml.cs
@@ -1,9 +1,7 @@
 using Panuon.WPF.UI;
-using Panuon.WPF.UI.Configurations;
 using Samples.Views.Tools;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Windows;
@@ -77,7 +75,7 @@ private void BtnSwitchTheme_Click(object sender, RoutedEventArgs e)
                 _themeFlag = 0;
             }
         }
-       
+
         private void BtnTestMessageBoxX_Click(object sender, RoutedEventArgs e)
         {
             MessageBoxX.Show(this, "MessageBoxX style configuration is placed in App.xaml. ", "Tips", MessageBoxIcon.Info, DefaultButton.YesOK, 5);

diff --git a/SourceCode/Core31/Panuon.WPF.UI/Panuon.WPF.UI.csproj b/SourceCode/Core31/Panuon.WPF.UI/Panuon.WPF.UI.csproj
@@ -1,40 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <WarningLevel>5</WarningLevel>
-    <OutputPath>..\..\Outputs\Debug\Core31\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\Outputs\Release\Core31\</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\SharedResources\Panuon.WPF.UI.Internal\Panuon.WPF.UI.Internal.projitems" Label="Shared" />
-
-  <Import Project="..\..\SharedResources\Panuon.WPF.UI\Panuon.WPF.UI.projitems" Label="Shared" />
-
-  <ItemGroup>
-    <None Remove="Resources\dropper.cur" />
-    <None Remove="Resources\Fonts\PanuonIcon.ttf" />
-    <None Remove="Resources\PanuonIcon.ttf" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Panuon.WPF">
-      <HintPath>..\..\References\Core31\netcoreapp3.1\Panuon.WPF.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="Resources\dropper.cur" />
-    <Resource Include="Resources\Fonts\PanuonIcon.ttf" />
-    <Resource Include="Resources\PanuonIcon.ttf" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<Nullable>disable</Nullable>
+		<UseWPF>true</UseWPF>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<WarningLevel>5</WarningLevel>
+		<OutputPath>..\..\outputs\Debug\core31\</OutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\..\outputs\Release\core31\</OutputPath>
+	</PropertyGroup>
+
+	<Import Project="..\..\SharedResources\Panuon.WPF.UI.Internal\Panuon.WPF.UI.Internal.projitems" Label="Shared" />
+
+	<Import Project="..\..\SharedResources\Panuon.WPF.UI\Panuon.WPF.UI.projitems" Label="Shared" />
+
+	<ItemGroup>
+		<None Remove="Resources\dropper.cur" />
+		<None Remove="Resources\Fonts\PanuonIcon.ttf" />
+		<None Remove="Resources\PanuonIcon.ttf" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Reference Include="Panuon.WPF">
+			<HintPath>..\..\references\core31\Panuon.WPF.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Resource Include="Resources\dropper.cur" />
+		<Resource Include="Resources\Fonts\PanuonIcon.ttf" />
+		<Resource Include="Resources\PanuonIcon.ttf" />
+	</ItemGroup>
 
 </Project>
diff --git a/SourceCode/Core31/Panuon.WPF.UI/Themes/Generic.xaml b/SourceCode/Core31/Panuon.WPF.UI/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Panuon.WPF.UI"
-                    xmlns:core="clr-namespace:Panuon.WPF;assembly=Panuon.WPF"
+                    xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:i="clr-namespace:Panuon.WPF.UI.Internal"
                     xmlns:rs="clr-namespace:Panuon.WPF.UI.Resources"
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
+        <pw:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="local:WindowX"

diff --git a/SourceCode/Net452/Panuon.WPF.UI/Panuon.WPF.UI.csproj b/SourceCode/Net452/Panuon.WPF.UI/Panuon.WPF.UI.csproj
@@ -19,15 +19,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Outputs\Debug\Net452\</OutputPath>
+    <OutputPath>..\..\outputs\Debug\net452\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Outputs\Release\Net452\</OutputPath>
+    <OutputPath>..\..\outputs\Release\net452\</OutputPath>
     <DefineConstants>TRACE;NET452</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/SourceCode/Net452/Panuon.WPF.UI/Themes/Generic.xaml b/SourceCode/Net452/Panuon.WPF.UI/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Panuon.WPF.UI"
-                    xmlns:core="clr-namespace:Panuon.WPF;assembly=Panuon.WPF"
+                    xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:i="clr-namespace:Panuon.WPF.UI.Internal"
                     xmlns:rs="clr-namespace:Panuon.WPF.UI.Resources"
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
+        <pw:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="local:WindowX"

diff --git a/SourceCode/Net462/Panuon.WPF.UI/Panuon.WPF.UI.csproj b/SourceCode/Net462/Panuon.WPF.UI/Panuon.WPF.UI.csproj
@@ -19,15 +19,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Outputs\Debug\Net462\</OutputPath>
+    <OutputPath>..\..\outputs\Debug\net462\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Outputs\Release\Net462\</OutputPath>
+    <OutputPath>..\..\outputs\Release\net462\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/SourceCode/Net462/Panuon.WPF.UI/Themes/Generic.xaml b/SourceCode/Net462/Panuon.WPF.UI/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Panuon.WPF.UI"
-                    xmlns:core="clr-namespace:Panuon.WPF;assembly=Panuon.WPF"
+                    xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:i="clr-namespace:Panuon.WPF.UI.Internal"
                     xmlns:rs="clr-namespace:Panuon.WPF.UI.Resources"
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
+        <pw:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="local:WindowX"

diff --git a/SourceCode/Net472/Panuon.WPF.UI/Panuon.WPF.UI.csproj b/SourceCode/Net472/Panuon.WPF.UI/Panuon.WPF.UI.csproj
@@ -18,15 +18,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Outputs\Debug\Net472\</OutputPath>
+    <OutputPath>..\..\outputs\Debug\net472\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Outputs\Release\Net472\</OutputPath>
+    <OutputPath>..\..\outputs\Release\net472\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/SourceCode/Net472/Panuon.WPF.UI/Themes/Generic.xaml b/SourceCode/Net472/Panuon.WPF.UI/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Panuon.WPF.UI"
-                    xmlns:core="clr-namespace:Panuon.WPF;assembly=Panuon.WPF"
+                    xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:i="clr-namespace:Panuon.WPF.UI.Internal"
                     xmlns:rs="clr-namespace:Panuon.WPF.UI.Resources"
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
+        <pw:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="local:WindowX"

diff --git a/SourceCode/Net48/Panuon.WPF.UI/Panuon.WPF.UI.csproj b/SourceCode/Net48/Panuon.WPF.UI/Panuon.WPF.UI.csproj
@@ -19,15 +19,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\Outputs\Debug\Net48\</OutputPath>
+    <OutputPath>..\..\outputs\Debug\net48\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\Outputs\Release\Net48\</OutputPath>
+    <OutputPath>..\..\outputs\Release\net48\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>

diff --git a/SourceCode/Net48/Panuon.WPF.UI/Themes/Generic.xaml b/SourceCode/Net48/Panuon.WPF.UI/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Panuon.WPF.UI"
-                    xmlns:core="clr-namespace:Panuon.WPF;assembly=Panuon.WPF"
+                    xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:i="clr-namespace:Panuon.WPF.UI.Internal"
                     xmlns:rs="clr-namespace:Panuon.WPF.UI.Resources"
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
+        <pw:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="local:WindowX"

diff --git a/SourceCode/Net5/Panuon.WPF.UI/Panuon.WPF.UI.csproj b/SourceCode/Net5/Panuon.WPF.UI/Panuon.WPF.UI.csproj
@@ -1,41 +1,42 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
-  <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <WarningLevel>5</WarningLevel>
-    <OutputPath>..\..\Outputs\Debug\Net5\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\Outputs\Release\Net5\</OutputPath>
-  </PropertyGroup>
-
-  <Import Project="..\..\SharedResources\Panuon.WPF.UI.Internal\Panuon.WPF.UI.Internal.projitems" Label="Shared" />
-
-  <Import Project="..\..\SharedResources\Panuon.WPF.UI\Panuon.WPF.UI.projitems" Label="Shared" />
-
-  <ItemGroup>
-    <None Remove="Resources\dropper.cur" />
-    <None Remove="Resources\Fonts\PanuonIcon.ttf" />
-    <None Remove="Resources\PanuonIcon.ttf" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Panuon.WPF">
-      <HintPath>..\..\References\Net5\Panuon.WPF.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="Resources\dropper.cur" />
-    <Resource Include="Resources\Fonts\PanuonIcon.ttf" />
-    <Resource Include="Resources\PanuonIcon.ttf" />
-  </ItemGroup>
+	<PropertyGroup>
+		<TargetFramework>net5.0-windows</TargetFramework>
+		<Nullable>disable</Nullable>
+		<UseWPF>true</UseWPF>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<WarningLevel>5</WarningLevel>
+		<OutputPath>..\..\outputs\Debug\net5\</OutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+		<OutputPath>..\..\outputs\Release\net5\</OutputPath>
+	</PropertyGroup>
+
+	<Import Project="..\..\SharedResources\Panuon.WPF.UI.Internal\Panuon.WPF.UI.Internal.projitems" Label="Shared" />
+
+	<Import Project="..\..\SharedResources\Panuon.WPF.UI\Panuon.WPF.UI.projitems" Label="Shared" />
+
+	<ItemGroup>
+		<None Remove="Resources\dropper.cur" />
+		<None Remove="Resources\Fonts\PanuonIcon.ttf" />
+		<None Remove="Resources\PanuonIcon.ttf" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Reference Include="Panuon.WPF">
+			<HintPath>..\..\References\net5\Panuon.WPF.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<Resource Include="Resources\dropper.cur" />
+		<Resource Include="Resources\Fonts\PanuonIcon.ttf" />
+		<Resource Include="Resources\PanuonIcon.ttf" />
+	</ItemGroup>
 
 </Project>
diff --git a/SourceCode/Net5/Panuon.WPF.UI/Themes/Generic.xaml b/SourceCode/Net5/Panuon.WPF.UI/Themes/Generic.xaml
@@ -1,12 +1,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Panuon.WPF.UI"
-                    xmlns:core="clr-namespace:Panuon.WPF;assembly=Panuon.WPF"
+                    xmlns:pw="https://opensource.panuon.com/wpf"
                     xmlns:i="clr-namespace:Panuon.WPF.UI.Internal"
                     xmlns:rs="clr-namespace:Panuon.WPF.UI.Resources"
                     xmlns:irs="clr-namespace:Panuon.WPF.UI.Internal.Resources">
     <ResourceDictionary.MergedDictionaries>
-        <core:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
+        <pw:SharedResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Themes/Generic.Core.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style TargetType="local:WindowX"