Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI更新

Browse Source
This commit is contained in:
末城via 2023-05-15 10:28:44 +08:00
parent e6e6e53dd5
commit 056ff018b0
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VPet-Simulator.Core/Display/Main.xaml
View File

@ -1,6 +1,6 @@
<pu:ContentControlX x:Class="VPet_Simulator.Core.Main" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <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: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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:VPet_Simulator.Core" 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"> mc:Ignorable="d" d:DesignHeight="250" d:DesignWidth="250">

2
VPet-Simulator.Core/Display/MessageBar.xaml
View File

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 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"> Width="500" MouseDoubleClick="UserControl_MouseDoubleClick">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary Source="Theme.xaml" /> <ResourceDictionary Source="Theme.xaml" />

2
VPet-Simulator.Core/Display/Theme.xaml
View File

@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 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"> xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
<SolidColorBrush x:Key="Primary" Color="#FF81d4fa" /> <SolidColorBrush x:Key="Primary" Color="#FF81d4fa" />
<SolidColorBrush x:Key="PrimaryTrans" Color="#DD81d4fa" /> <SolidColorBrush x:Key="PrimaryTrans" Color="#DD81d4fa" />

2
VPet-Simulator.Core/Display/ToolBar.xaml
View File

@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 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" 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"> MouseEnter="UserControl_MouseEnter" MouseLeave="UserControl_MouseLeave" Height="500" Width="500">
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary> <ResourceDictionary>

6
VPet-Simulator.Core/Display/basestyle.xaml
View File

@ -1,6 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 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"> xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<pucore:SharedResourceDictionary Source="/Panuon.WPF.UI;component/Control.xaml" /> <pucore:SharedResourceDictionary Source="/Panuon.WPF.UI;component/Control.xaml" />
@ -109,7 +109,7 @@
<Setter Property="pu:WindowXCaption.Buttons" Value="Close" /> <Setter Property="pu:WindowXCaption.Buttons" Value="Close" />
<Setter Property="pu:WindowXCaption.CloseButtonStyle"> <Setter Property="pu:WindowXCaption.CloseButtonStyle">
<Setter.Value> <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}" /> <Setter Property="pu:ButtonHelper.HoverBackground" Value="{x:Null}" />
</Style> </Style>
</Setter.Value> </Setter.Value>
@ -141,7 +141,7 @@
<Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle"> <Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle">
<Setter.Value> <Setter.Value>
<Style TargetType="pu:TransformControl" <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="Foreground" Value="{DynamicResource PrimaryText}" />
<Setter Property="FontSize" Value="10" /> <Setter Property="FontSize" Value="10" />
<Setter Property="Content" Value="&#xe91f;" /> <Setter Property="Content" Value="&#xe91f;" />

8
VPet-Simulator.Core/VPet-Simulator.Core.csproj
View File

@ -74,13 +74,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="LinePutScript, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL"> <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>
<Reference Include="Panuon.WPF, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL"> <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>
<Reference Include="Panuon.WPF.UI, Version=1.1.9.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Panuon.WPF.UI, Version=1.1.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Panuon.WPF.UI.1.1.9.4\lib\net462\Panuon.WPF.UI.dll</HintPath> <HintPath>..\..\VUP-Simulator\packages\Panuon.WPF.UI.1.1.10\lib\net462\Panuon.WPF.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />

2
VPet-Simulator.Core/packages.config
View File

@ -2,5 +2,5 @@
<packages> <packages>
<package id="LinePutScript" version="1.8.0" targetFramework="net462" /> <package id="LinePutScript" version="1.8.0" targetFramework="net462" />
<package id="Panuon.WPF" version="1.0.1" 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> </packages>