From 056ff018b0d0e71c45de53d1105bea83fc6ce102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=AB=E5=9F=8Evia?= <mochengvia@panuon.com>
Date: Mon, 15 May 2023 10:28:44 +0800
Subject: [PATCH] =?UTF-8?q?UI=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/Main.xaml          | 2 +-
 VPet-Simulator.Core/Display/MessageBar.xaml    | 2 +-
 VPet-Simulator.Core/Display/Theme.xaml         | 2 +-
 VPet-Simulator.Core/Display/ToolBar.xaml       | 2 +-
 VPet-Simulator.Core/Display/basestyle.xaml     | 6 +++---
 VPet-Simulator.Core/VPet-Simulator.Core.csproj | 8 ++++----
 VPet-Simulator.Core/packages.config            | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/VPet-Simulator.Core/Display/Main.xaml b/VPet-Simulator.Core/Display/Main.xaml
index 1ad9889..c779c2c 100644
--- a/VPet-Simulator.Core/Display/Main.xaml
+++ b/VPet-Simulator.Core/Display/Main.xaml
@@ -1,6 +1,6 @@
 <pu:ContentControlX x:Class="VPet_Simulator.Core.Main" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
+        xmlns:pu="https://opensource.panuon.com/wpf-ui"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:VPet_Simulator.Core"
         mc:Ignorable="d" d:DesignHeight="250" d:DesignWidth="250">
diff --git a/VPet-Simulator.Core/Display/MessageBar.xaml b/VPet-Simulator.Core/Display/MessageBar.xaml
index ec16433..a5badc9 100644
--- a/VPet-Simulator.Core/Display/MessageBar.xaml
+++ b/VPet-Simulator.Core/Display/MessageBar.xaml
@@ -3,7 +3,7 @@
         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:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" xmlns:local="clr-namespace:VPet_Simulator.Core" mc:Ignorable="d" Height="500"
+        xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:local="clr-namespace:VPet_Simulator.Core" mc:Ignorable="d" Height="500"
        Width="500" MouseDoubleClick="UserControl_MouseDoubleClick">
     <UserControl.Resources>
         <ResourceDictionary Source="Theme.xaml" />
diff --git a/VPet-Simulator.Core/Display/Theme.xaml b/VPet-Simulator.Core/Display/Theme.xaml
index 784ac33..a3d43df 100644
--- a/VPet-Simulator.Core/Display/Theme.xaml
+++ b/VPet-Simulator.Core/Display/Theme.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
+        xmlns:pu="https://opensource.panuon.com/wpf-ui"
         xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
     <SolidColorBrush x:Key="Primary" Color="#FF81d4fa" />
     <SolidColorBrush x:Key="PrimaryTrans" Color="#DD81d4fa" />
diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml b/VPet-Simulator.Core/Display/ToolBar.xaml
index d28a239..3cdd6b7 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml
@@ -2,7 +2,7 @@
         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:VPet_Simulator.Core"
-        mc:Ignorable="d" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
+        mc:Ignorable="d" xmlns:pu="https://opensource.panuon.com/wpf-ui"
         MouseEnter="UserControl_MouseEnter" MouseLeave="UserControl_MouseLeave" Height="500" Width="500">
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/VPet-Simulator.Core/Display/basestyle.xaml b/VPet-Simulator.Core/Display/basestyle.xaml
index f586969..1fb006a 100644
--- a/VPet-Simulator.Core/Display/basestyle.xaml
+++ b/VPet-Simulator.Core/Display/basestyle.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
+        xmlns:pu="https://opensource.panuon.com/wpf-ui"
         xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
     <ResourceDictionary.MergedDictionaries>
         <pucore:SharedResourceDictionary Source="/Panuon.WPF.UI;component/Control.xaml" />
@@ -109,7 +109,7 @@
         <Setter Property="pu:WindowXCaption.Buttons" Value="Close" />
         <Setter Property="pu:WindowXCaption.CloseButtonStyle">
             <Setter.Value>
-                <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyle}}">
+                <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyleKey}}">
                     <Setter Property="pu:ButtonHelper.HoverBackground" Value="{x:Null}" />
                 </Style>
             </Setter.Value>
@@ -141,7 +141,7 @@
         <Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle">
             <Setter.Value>
                 <Style TargetType="pu:TransformControl"
-                        BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyle}}">
+                        BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyleKey}}">
                     <Setter Property="Foreground" Value="{DynamicResource PrimaryText}" />
                     <Setter Property="FontSize" Value="10" />
                     <Setter Property="Content" Value="&#xe91f;" />
diff --git a/VPet-Simulator.Core/VPet-Simulator.Core.csproj b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
index fddc278..541ce0e 100644
--- a/VPet-Simulator.Core/VPet-Simulator.Core.csproj
+++ b/VPet-Simulator.Core/VPet-Simulator.Core.csproj
@@ -74,13 +74,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="LinePutScript, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LinePutScript.1.8.0\lib\net462\LinePutScript.dll</HintPath>
+      <HintPath>..\..\VUP-Simulator\packages\LinePutScript.1.8.0\lib\net462\LinePutScript.dll</HintPath>
     </Reference>
     <Reference Include="Panuon.WPF, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\VUPSimulator\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll</HintPath>
+      <HintPath>..\..\VUP-Simulator\packages\Panuon.WPF.1.0.1\lib\net462\Panuon.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="Panuon.WPF.UI, Version=1.1.9.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Panuon.WPF.UI.1.1.9.4\lib\net462\Panuon.WPF.UI.dll</HintPath>
+    <Reference Include="Panuon.WPF.UI, Version=1.1.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\VUP-Simulator\packages\Panuon.WPF.UI.1.1.10\lib\net462\Panuon.WPF.UI.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
diff --git a/VPet-Simulator.Core/packages.config b/VPet-Simulator.Core/packages.config
index b234222..5991b27 100644
--- a/VPet-Simulator.Core/packages.config
+++ b/VPet-Simulator.Core/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="LinePutScript" version="1.8.0" targetFramework="net462" />
   <package id="Panuon.WPF" version="1.0.1" targetFramework="net462" />
-  <package id="Panuon.WPF.UI" version="1.1.9.4" targetFramework="net462" />
+  <package id="Panuon.WPF.UI" version="1.1.10" targetFramework="net462" />
 </packages>
\ No newline at end of file