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

更新PUI

Browse Source
This commit is contained in:
ZouJin 2024-03-18 14:59:14 +08:00
parent c5047a7581
commit 649ebf133b
9 changed files with 480 additions and 584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,364 +1,309 @@
<ResourceDictionary <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
xmlns:pu="https://opensource.panuon.com/wpf-ui" <ResourceDictionary.MergedDictionaries>
xmlns:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF"> <pu:StyleDictionary Includes="All" />
<ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<pucore:SharedResourceDictionary Source="/Panuon.WPF.UI;component/Control.xaml" />
</ResourceDictionary.MergedDictionaries>
<DrawingBrush <DrawingBrush x:Key="ProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
x:Key="ProgressBarForeground" ViewportUnits="Absolute">
Stretch="None" <DrawingBrush.RelativeTransform>
TileMode="Tile" <RotateTransform Angle="2" />
Viewport="0,0,8,22" </DrawingBrush.RelativeTransform>
ViewportUnits="Absolute"> <DrawingBrush.Drawing>
<DrawingBrush.RelativeTransform> <DrawingGroup>
<RotateTransform Angle="2" /> <GeometryDrawing Brush="{DynamicResource DARKPrimaryTransA}">
</DrawingBrush.RelativeTransform> <GeometryDrawing.Geometry>
<DrawingBrush.Drawing> <GeometryGroup>
<DrawingGroup> <RectangleGeometry Rect="5.5,0,2.5,22" />
<GeometryDrawing Brush="{DynamicResource DARKPrimaryTransA}"> </GeometryGroup>
<GeometryDrawing.Geometry> </GeometryDrawing.Geometry>
<GeometryGroup> </GeometryDrawing>
<RectangleGeometry Rect="5.5,0,2.5,22" /> <GeometryDrawing Brush="{DynamicResource DARKPrimary}">
</GeometryGroup> <GeometryDrawing.Geometry>
</GeometryDrawing.Geometry> <GeometryGroup>
</GeometryDrawing> <RectangleGeometry Rect="0,0,5.5,22" />
<GeometryDrawing Brush="{DynamicResource DARKPrimary}"> </GeometryGroup>
<GeometryDrawing.Geometry> </GeometryDrawing.Geometry>
<GeometryGroup> </GeometryDrawing>
<RectangleGeometry Rect="0,0,5.5,22" /> </DrawingGroup>
</GeometryGroup> </DrawingBrush.Drawing>
</GeometryDrawing.Geometry> </DrawingBrush>
</GeometryDrawing> <DrawingBrush x:Key="SuccessProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
</DrawingGroup> ViewportUnits="Absolute">
</DrawingBrush.Drawing> <DrawingBrush.RelativeTransform>
</DrawingBrush> <RotateTransform Angle="2" />
<DrawingBrush </DrawingBrush.RelativeTransform>
x:Key="SuccessProgressBarForeground" <DrawingBrush.Drawing>
Stretch="None" <DrawingGroup>
TileMode="Tile" <GeometryDrawing Brush="#AAAACC6C">
Viewport="0,0,8,22" <GeometryDrawing.Geometry>
ViewportUnits="Absolute"> <GeometryGroup>
<DrawingBrush.RelativeTransform> <RectangleGeometry Rect="5.5,0,2.5,22" />
<RotateTransform Angle="2" /> </GeometryGroup>
</DrawingBrush.RelativeTransform> </GeometryDrawing.Geometry>
<DrawingBrush.Drawing> </GeometryDrawing>
<DrawingGroup> <GeometryDrawing Brush="#AACC6C">
<GeometryDrawing Brush="#AAAACC6C"> <GeometryDrawing.Geometry>
<GeometryDrawing.Geometry> <GeometryGroup>
<GeometryGroup> <RectangleGeometry Rect="0,0,5.5,22" />
<RectangleGeometry Rect="5.5,0,2.5,22" /> </GeometryGroup>
</GeometryGroup> </GeometryDrawing.Geometry>
</GeometryDrawing.Geometry> </GeometryDrawing>
</GeometryDrawing> </DrawingGroup>
<GeometryDrawing Brush="#AACC6C"> </DrawingBrush.Drawing>
<GeometryDrawing.Geometry> </DrawingBrush>
<GeometryGroup> <DrawingBrush x:Key="WarningProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
<RectangleGeometry Rect="0,0,5.5,22" /> ViewportUnits="Absolute">
</GeometryGroup> <DrawingBrush.RelativeTransform>
</GeometryDrawing.Geometry> <RotateTransform Angle="2" />
</GeometryDrawing> </DrawingBrush.RelativeTransform>
</DrawingGroup> <DrawingBrush.Drawing>
</DrawingBrush.Drawing> <DrawingGroup>
</DrawingBrush> <GeometryDrawing Brush="#AAFFCC4C">
<DrawingBrush <GeometryDrawing.Geometry>
x:Key="WarningProgressBarForeground" <GeometryGroup>
Stretch="None" <RectangleGeometry Rect="5.5,0,2.5,22" />
TileMode="Tile" </GeometryGroup>
Viewport="0,0,8,22" </GeometryDrawing.Geometry>
ViewportUnits="Absolute"> </GeometryDrawing>
<DrawingBrush.RelativeTransform> <GeometryDrawing Brush="#FFCC4C">
<RotateTransform Angle="2" /> <GeometryDrawing.Geometry>
</DrawingBrush.RelativeTransform> <GeometryGroup>
<DrawingBrush.Drawing> <RectangleGeometry Rect="0,0,5.5,22" />
<DrawingGroup> </GeometryGroup>
<GeometryDrawing Brush="#AAFFCC4C"> </GeometryDrawing.Geometry>
<GeometryDrawing.Geometry> </GeometryDrawing>
<GeometryGroup> </DrawingGroup>
<RectangleGeometry Rect="5.5,0,2.5,22" /> </DrawingBrush.Drawing>
</GeometryGroup> </DrawingBrush>
</GeometryDrawing.Geometry> <DrawingBrush x:Key="DangerProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
</GeometryDrawing> ViewportUnits="Absolute">
<GeometryDrawing Brush="#FFCC4C"> <DrawingBrush.RelativeTransform>
<GeometryDrawing.Geometry> <RotateTransform Angle="2" />
<GeometryGroup> </DrawingBrush.RelativeTransform>
<RectangleGeometry Rect="0,0,5.5,22" /> <DrawingBrush.Drawing>
</GeometryGroup> <DrawingGroup>
</GeometryDrawing.Geometry> <GeometryDrawing Brush="#AAFF4C4C">
</GeometryDrawing> <GeometryDrawing.Geometry>
</DrawingGroup> <GeometryGroup>
</DrawingBrush.Drawing> <RectangleGeometry Rect="5.5,0,2.5,22" />
</DrawingBrush> </GeometryGroup>
<DrawingBrush </GeometryDrawing.Geometry>
x:Key="DangerProgressBarForeground" </GeometryDrawing>
Stretch="None" <GeometryDrawing Brush="#FF4C4C">
TileMode="Tile" <GeometryDrawing.Geometry>
Viewport="0,0,8,22" <GeometryGroup>
ViewportUnits="Absolute"> <RectangleGeometry Rect="0,0,5.5,22" />
<DrawingBrush.RelativeTransform> </GeometryGroup>
<RotateTransform Angle="2" /> </GeometryDrawing.Geometry>
</DrawingBrush.RelativeTransform> </GeometryDrawing>
<DrawingBrush.Drawing> </DrawingGroup>
<DrawingGroup> </DrawingBrush.Drawing>
<GeometryDrawing Brush="#AAFF4C4C"> </DrawingBrush>
<GeometryDrawing.Geometry>
<GeometryGroup>
<RectangleGeometry Rect="5.5,0,2.5,22" />
</GeometryGroup>
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF4C4C">
<GeometryDrawing.Geometry>
<GeometryGroup>
<RectangleGeometry Rect="0,0,5.5,22" />
</GeometryGroup>
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingGroup>
</DrawingBrush.Drawing>
</DrawingBrush>
<Style x:Key="BaseWindowXStyle" TargetType="pu:WindowX"> <Style x:Key="BaseWindowXStyle" TargetType="pu:WindowX">
<Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
<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 BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyleKey}}" TargetType="Button"> <Style BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyleKey}}" TargetType="Button">
<Setter Property="pu:ButtonHelper.HoverBackground" Value="{x:Null}" /> <Setter Property="pu:ButtonHelper.HoverBackground" Value="{x:Null}" />
</Style> </Style>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style <Style x:Key="ThemedButtonStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
x:Key="ThemedButtonStyle" <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
BasedOn="{StaticResource {x:Type Button}}" <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
TargetType="{x:Type Button}"> <Setter Property="Padding" Value="10,5" />
<Setter Property="Background" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" /> </Style>
<Setter Property="Padding" Value="10,5" />
<Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
</Style>
<Style <Style x:Key="TextButtonStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
x:Key="TextButtonStyle" <Setter Property="Background" Value="Transparent" />
BasedOn="{StaticResource {x:Type Button}}" <Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
TargetType="{x:Type Button}"> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Padding" Value="0" />
<Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" /> <Setter Property="FontSize" Value="12" />
<Setter Property="Cursor" Value="Hand" /> </Style>
<Setter Property="Padding" Value="0" />
<Setter Property="FontSize" Value="12" />
</Style>
<Style <Style x:Key="DARKPrimaryTextButtonStyle" BasedOn="{StaticResource TextButtonStyle}" TargetType="{x:Type Button}">
x:Key="DARKPrimaryTextButtonStyle" <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
BasedOn="{StaticResource TextButtonStyle}" </Style>
TargetType="{x:Type Button}">
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
</Style>
<Style <Style x:Key="IconInvertedForegroundRepeatButtonStyle" BasedOn="{StaticResource {x:Type RepeatButton}}"
x:Key="IconInvertedForegroundRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
BasedOn="{StaticResource {x:Type RepeatButton}}" <Setter Property="Width" Value="25" />
TargetType="{x:Type RepeatButton}"> <Setter Property="Height" Value="25" />
<Setter Property="Width" Value="25" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Height" Value="25" /> <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="Padding" Value="0" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="FontSize" Value="15" />
<Setter Property="Padding" Value="0" /> <Setter Property="FontFamily" Value="pack://application:,,,/Res/#remixicon" />
<Setter Property="FontSize" Value="15" /> </Style>
<Setter Property="FontFamily" Value="pack://application:,,,/Res/#remixicon" />
</Style>
<Style <Style x:Key="LinkButtonStyle" BasedOn="{StaticResource TextButtonStyle}" TargetType="{x:Type Button}">
x:Key="LinkButtonStyle" <Setter Property="ContentTemplate">
BasedOn="{StaticResource TextButtonStyle}" <Setter.Value>
TargetType="{x:Type Button}"> <DataTemplate>
<Setter Property="ContentTemplate"> <TextBlock Text="{Binding}" TextDecorations="Underline" />
<Setter.Value> </DataTemplate>
<DataTemplate> </Setter.Value>
<TextBlock Text="{Binding}" TextDecorations="Underline" /> </Setter>
</DataTemplate> </Style>
</Setter.Value>
</Setter>
</Style>
<Style <Style x:Key="StndardToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
x:Key="StndardToggleButtonStyle" TargetType="{x:Type ToggleButton}">
BasedOn="{StaticResource {x:Type ToggleButton}}" <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
TargetType="{x:Type ToggleButton}"> <Setter Property="pu:ToggleButtonHelper.CheckedBackground" Value="{DynamicResource DARKPrimaryDarker}" />
<Setter Property="Background" Value="{DynamicResource DARKPrimary}" /> <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="pu:ToggleButtonHelper.CheckedBackground" Value="{DynamicResource DARKPrimaryDarker}" /> <Setter Property="Padding" Value="10,5" />
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
<Setter Property="Padding" Value="10,5" /> </Style>
<Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
</Style>
<Style <Style x:Key="TextToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
x:Key="TextToggleButtonStyle" TargetType="{x:Type ToggleButton}">
BasedOn="{StaticResource {x:Type ToggleButton}}" <Setter Property="Background" Value="Transparent" />
TargetType="{x:Type ToggleButton}"> <Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" /> <Setter Property="Padding" Value="0" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Padding" Value="0" /> </Style>
<Setter Property="FontSize" Value="14" />
</Style>
<Style <Style x:Key="LinkToggleButtonStyle" BasedOn="{StaticResource TextToggleButtonStyle}"
x:Key="LinkToggleButtonStyle" TargetType="{x:Type ToggleButton}">
BasedOn="{StaticResource TextToggleButtonStyle}" <Setter Property="ContentTemplate">
TargetType="{x:Type ToggleButton}"> <Setter.Value>
<Setter Property="ContentTemplate"> <DataTemplate>
<Setter.Value> <TextBlock Text="{Binding}" TextDecorations="Underline" />
<DataTemplate> </DataTemplate>
<TextBlock Text="{Binding}" TextDecorations="Underline" /> </Setter.Value>
</DataTemplate> </Setter>
</Setter.Value> </Style>
</Setter>
</Style>
<Style x:Key="StandardPaginationStyle" TargetType="{x:Type pu:Pagination}"> <Style x:Key="StandardPaginationStyle" TargetType="{x:Type pu:Pagination}">
<Setter Property="Height" Value="25" /> <Setter Property="Height" Value="25" />
<Setter Property="ItemsWidth" Value="NaN" /> <Setter Property="ItemsWidth" Value="NaN" />
<Setter Property="ItemsPadding" Value="7,0" /> <Setter Property="ItemsPadding" Value="7,0" />
<Setter Property="ItemsBackground" Value="{DynamicResource DARKPrimaryTrans4}" /> <Setter Property="ItemsBackground" Value="{DynamicResource DARKPrimaryTrans4}" />
<Setter Property="ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" /> <Setter Property="ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="ItemsCornerRadius" Value="2" /> <Setter Property="ItemsCornerRadius" Value="2" />
</Style> </Style>
<Style <Style x:Key="StandardComboBoxStyle" BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="{x:Type ComboBox}">
x:Key="StandardComboBoxStyle" <Setter Property="FontSize" Value="14" />
BasedOn="{StaticResource {x:Type ComboBox}}" <Setter Property="Height" Value="30" />
TargetType="{x:Type ComboBox}"> <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="FontSize" Value="14" /> <Setter Property="BorderThickness" Value="1.5" />
<Setter Property="Height" Value="30" /> <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
<Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="Padding" Value="7,0,15,0" />
<Setter Property="BorderThickness" Value="1.5" /> <Setter Property="pu:ComboBoxHelper.CornerRadius" Value="5" />
<Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:ComboBoxHelper.WatermarkForeground" Value="#DCDCDC" />
<Setter Property="Padding" Value="7,0,15,0" /> <Setter Property="pu:ComboBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:ComboBoxHelper.CornerRadius" Value="5" /> <Setter Property="pu:ComboBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="pu:ComboBoxHelper.WatermarkForeground" Value="#DCDCDC" /> <Setter Property="pu:ComboBoxHelper.ItemsHoverBackground" Value="{DynamicResource DARKPrimaryTrans4}" />
<Setter Property="pu:ComboBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:ComboBoxHelper.ItemsPadding" Value="22,0" />
<Setter Property="pu:ComboBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:DropDownHelper.BorderThickness" Value="1" />
<Setter Property="pu:ComboBoxHelper.ItemsHoverBackground" Value="{DynamicResource DARKPrimaryTrans4}" /> <Setter Property="pu:DropDownHelper.Background" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="pu:ComboBoxHelper.ItemsPadding" Value="22,0" /> <Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" />
<Setter Property="pu:DropDownHelper.BorderThickness" Value="1" /> <Setter Property="pu:DropDownHelper.CornerRadius" Value="5" />
<Setter Property="pu:DropDownHelper.Background" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:DropDownHelper.MinHeight" Value="100" />
<Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" /> <Setter Property="pu:DropDownHelper.ClipDockSideShadow" Value="False" />
<Setter Property="pu:DropDownHelper.CornerRadius" Value="5" /> <Setter Property="pu:DropDownHelper.BorderBrush" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:DropDownHelper.MinHeight" Value="100" /> <Setter Property="pu:ShadowHelper.BlurRadius" Value="15" />
<Setter Property="pu:DropDownHelper.ClipDockSideShadow" Value="False" /> <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
<Setter Property="pu:DropDownHelper.BorderBrush" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle">
<Setter Property="pu:ShadowHelper.BlurRadius" Value="15" /> <Setter.Value>
<Setter Property="pu:ShadowHelper.Opacity" Value="0.5" /> <Style BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyleKey}}"
<Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle"> TargetType="pu:TransformControl">
<Setter.Value> <Setter Property="Foreground" Value="{DynamicResource PrimaryText}" />
<Style BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyleKey}}" TargetType="pu:TransformControl"> <Setter Property="FontSize" Value="10" />
<Setter Property="Foreground" Value="{DynamicResource PrimaryText}" /> <Setter Property="Content" Value="&#xe91f;" />
<Setter Property="FontSize" Value="10" /> </Style>
<Setter Property="Content" Value="&#xe91f;" /> </Setter.Value>
</Style> </Setter>
</Setter.Value> </Style>
</Setter> <Style x:Key="StandardTextBoxStyle" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
</Style> <Setter Property="FontSize" Value="14" />
<Style <Setter Property="Height" Value="30" />
x:Key="StandardTextBoxStyle" <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
BasedOn="{StaticResource {x:Type TextBox}}" <Setter Property="BorderThickness" Value="1.5" />
TargetType="TextBox"> <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
<Setter Property="FontSize" Value="14" /> <Setter Property="Padding" Value="7,0,15,0" />
<Setter Property="Height" Value="30" /> <Setter Property="pu:TextBoxHelper.CornerRadius" Value="5" />
<Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:TextBoxHelper.WatermarkForeground" Value="#DCDCDC" />
<Setter Property="BorderThickness" Value="1.5" /> <Setter Property="pu:ShadowHelper.BlurRadius" Value="15" />
<Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
<Setter Property="Padding" Value="7,0,15,0" /> </Style>
<Setter Property="pu:TextBoxHelper.CornerRadius" Value="5" /> <Style x:Key="StandardSliderStyle" BasedOn="{StaticResource {x:Type Slider}}" TargetType="Slider">
<Setter Property="pu:TextBoxHelper.WatermarkForeground" Value="#DCDCDC" /> <Setter Property="Background" Value="{DynamicResource DARKPrimaryTrans4}" />
<Setter Property="pu:ShadowHelper.BlurRadius" Value="15" /> <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDark}" />
<Setter Property="pu:ShadowHelper.Opacity" Value="0.5" /> <Setter Property="pu:SliderHelper.ThumbShadowColor" Value="{DynamicResource ShadowColor}" />
</Style> <Setter Property="pu:SliderHelper.TrackThickness" Value="2.5" />
<Style <Setter Property="pu:SliderHelper.ThumbBorderBrush" Value="{DynamicResource DARKPrimary}" />
x:Key="StandardSliderStyle" <Setter Property="pu:SliderHelper.ThumbBorderThickness" Value="2.5" />
BasedOn="{StaticResource {x:Type Slider}}" <Setter Property="pu:SliderHelper.CoveredBackground" Value="{DynamicResource DARKPrimary}" />
TargetType="Slider"> <Setter Property="pu:ShadowHelper.ShadowDepth" Value="3" />
<Setter Property="Background" Value="{DynamicResource DARKPrimaryTrans4}" /> <Setter Property="pu:ShadowHelper.Direction" Value="270" />
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDark}" /> <Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
<Setter Property="pu:SliderHelper.ThumbShadowColor" Value="{DynamicResource ShadowColor}" /> </Style>
<Setter Property="pu:SliderHelper.TrackThickness" Value="2.5" />
<Setter Property="pu:SliderHelper.ThumbBorderBrush" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:SliderHelper.ThumbBorderThickness" Value="2.5" />
<Setter Property="pu:SliderHelper.CoveredBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:ShadowHelper.ShadowDepth" Value="3" />
<Setter Property="pu:ShadowHelper.Direction" Value="270" />
<Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
</Style>
<Style <Style x:Key="StandardRadioButtonStyle" BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
x:Key="StandardRadioButtonStyle" <Setter Property="pu:RadioButtonHelper.CheckedToggleBrush" Value="{DynamicResource DARKPrimary}" />
BasedOn="{StaticResource {x:Type RadioButton}}" <Setter Property="pu:RadioButtonHelper.CheckedBorderBrush" Value="{DynamicResource DARKPrimary}" />
TargetType="RadioButton"> </Style>
<Setter Property="pu:RadioButtonHelper.CheckedToggleBrush" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:RadioButtonHelper.CheckedBorderBrush" Value="{DynamicResource DARKPrimary}" />
</Style>
<Style <Style x:Key="SideMenuListBoxStyle" BasedOn="{StaticResource {x:Type ListBox}}" TargetType="ListBox">
x:Key="SideMenuListBoxStyle" <Setter Property="BorderThickness" Value="0" />
BasedOn="{StaticResource {x:Type ListBox}}" <Setter Property="Background" Value="Transparent" />
TargetType="ListBox"> <Setter Property="pu:ListBoxHelper.ItemsHeight" Value="30" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="pu:ListBoxHelper.ItemsPadding" Value="15,0" />
<Setter Property="Background" Value="Transparent" /> <Setter Property="pu:ListBoxHelper.ItemsCornerRadius" Value="5" />
<Setter Property="pu:ListBoxHelper.ItemsHeight" Value="30" /> <Setter Property="pu:ListBoxHelper.ItemsHoverBackground" Value="{x:Null}" />
<Setter Property="pu:ListBoxHelper.ItemsPadding" Value="15,0" /> <Setter Property="pu:ListBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:ListBoxHelper.ItemsCornerRadius" Value="5" /> <Setter Property="pu:ListBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="pu:ListBoxHelper.ItemsHoverBackground" Value="{x:Null}" /> </Style>
<Setter Property="pu:ListBoxHelper.ItemsSelectedBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:ListBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
</Style>
<Style <Style x:Key="ToolBarMenuStyle" BasedOn="{StaticResource {x:Type Menu}}" TargetType="Menu">
x:Key="ToolBarMenuStyle" <Setter Property="Height" Value="55" />
BasedOn="{StaticResource {x:Type Menu}}" <Setter Property="FontSize" Value="24" />
TargetType="Menu"> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Height" Value="55" /> <Setter Property="pu:MenuHelper.TopLevelDropDownVerticalOffset" Value="-25" />
<Setter Property="FontSize" Value="24" /> <Setter Property="BorderBrush" Value="{DynamicResource DARKPrimaryDarker}" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="pu:MenuHelper.TopLevelDropDownVerticalOffset" Value="-25" /> <Setter Property="pu:MenuHelper.CornerRadius" Value="5" />
<Setter Property="BorderBrush" Value="{DynamicResource DARKPrimaryDarker}" /> <Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="TopRight" />
<Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="15,0" />
<Setter Property="pu:MenuHelper.CornerRadius" Value="5" /> <Setter Property="pu:MenuHelper.TopLevelItemsHeight" Value="55" />
<Setter Property="pu:MenuHelper.TopLevelDropDownPlacement" Value="TopRight" /> <Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="Transparent" />
<Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="15,0" /> <Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" />
<Setter Property="pu:MenuHelper.TopLevelItemsHeight" Value="55" /> <Setter Property="pu:MenuHelper.TopLevelItemsHoverForeground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="Transparent" /> <Setter Property="pu:MenuHelper.TopLevelItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" />
<Setter Property="pu:MenuHelper.TopLevelItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" /> <Setter Property="pu:MenuHelper.TopLevelItemsOpenedForeground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:MenuHelper.TopLevelItemsHoverForeground" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="15,0" />
<Setter Property="pu:MenuHelper.TopLevelItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" /> <Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="55" />
<Setter Property="pu:MenuHelper.TopLevelItemsOpenedForeground" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:MenuHelper.SubmenuItemsIconWidth" Value="NaN" />
<Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="15,0" /> <Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="200" />
<Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="55" /> <Setter Property="pu:DropDownHelper.CornerRadius" Value="5" />
<Setter Property="pu:MenuHelper.SubmenuItemsIconWidth" Value="NaN" /> <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="Transparent" />
<Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="200" /> <Setter Property="pu:MenuHelper.SubmenuItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" />
<Setter Property="pu:DropDownHelper.CornerRadius" Value="5" /> <!--<Setter Property="pu:MenuHelper.SubmenuItemsHoverForeground"
<Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="Transparent" />
<Setter Property="pu:MenuHelper.SubmenuItemsHoverBackground" Value="{DynamicResource SecondaryLighter}" />
<!--<Setter Property="pu:MenuHelper.SubmenuItemsHoverForeground"
Value="{DynamicResource DARKPrimary}" />--> Value="{DynamicResource DARKPrimary}" />-->
<Setter Property="pu:MenuHelper.SubmenuItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" /> <Setter Property="pu:MenuHelper.SubmenuItemsOpenedBackground" Value="{DynamicResource SecondaryLighter}" />
<!--<Setter Property="pu:MenuHelper.SubmenuItemsOpenedForeground" <!--<Setter Property="pu:MenuHelper.SubmenuItemsOpenedForeground"
Value="{DynamicResource DARKPrimary}" />--> Value="{DynamicResource DARKPrimary}" />-->
<Setter Property="pu:MenuHelper.SubmenuItemsSeparatorVisibility" Value="Visible" /> <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorVisibility" Value="Visible" />
<Setter Property="pu:MenuHelper.SubmenuItemsSeparatorBrush" Value="#CCCECF" /> <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorBrush" Value="#CCCECF" />
<Setter Property="pu:MenuHelper.SubmenuItemsSeparatorMargin" Value="10,0" /> <Setter Property="pu:MenuHelper.SubmenuItemsSeparatorMargin" Value="10,0" />
<!--<Setter Property="pu:MenuHelper.ShadowColor" <!--<Setter Property="pu:MenuHelper.ShadowColor"
Value="{DynamicResource ShadowColor}" />--> Value="{DynamicResource ShadowColor}" />-->
<Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" /> <Setter Property="pu:DropDownHelper.ShadowColor" Value="{DynamicResource ShadowColor}" />
<Setter Property="pu:ShadowHelper.Opacity" Value="0.7" /> <Setter Property="pu:ShadowHelper.Opacity" Value="0.7" />
<Setter Property="pu:ShadowHelper.BlurRadius" Value="25" /> <Setter Property="pu:ShadowHelper.BlurRadius" Value="25" />
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>

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

@ -23,10 +23,10 @@
<None Include="..\.editorconfig" Link=".editorconfig" /> <None Include="..\.editorconfig" Link=".editorconfig" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LinePutScript" Version="1.11.3" /> <PackageReference Include="LinePutScript" Version="1.11.4" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
<PackageReference Include="Panuon.WPF" Version="1.0.4" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Properties\Resources.Designer.cs"> <Compile Update="Properties\Resources.Designer.cs">

6
VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
View File

@ -16,9 +16,9 @@
<ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" /> <ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LinePutScript" Version="1.11.3" /> <PackageReference Include="LinePutScript" Version="1.11.4" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
<PackageReference Include="Panuon.WPF" Version="1.0.4" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
View File

@ -214,12 +214,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Facepunch.Steamworks" Condition="'$(Platform)' == 'x64'" Version="2.3.3" /> <PackageReference Include="Facepunch.Steamworks" Condition="'$(Platform)' == 'x64'" Version="2.3.3" />
<PackageReference Include="Facepunch.Steamworks.win32" Condition="'$(Platform)' == 'x86'" Version="2.3.3" /> <PackageReference Include="Facepunch.Steamworks.win32" Condition="'$(Platform)' == 'x86'" Version="2.3.3" />
<PackageReference Include="LinePutScript" Version="1.11.3" /> <PackageReference Include="LinePutScript" Version="1.11.4" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NAudio" Version="2.2.1" /> <PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="Panuon.WPF" Version="1.0.4" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" /> <ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />

4
VPet-Simulator.Windows/WinDesign/winBetterBuy.xaml
View File

@ -177,7 +177,7 @@
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Width="{Binding ActualWidth, Converter={StaticResource {x:Static pu:ConverterKeys.DoubleDivideByConverter}},ConverterParameter=2, ElementName=StkContainer}"> Width="{Binding ActualWidth, Converter={x:Static pu:Converters.DoubleDivideByConverter},ConverterParameter=2, ElementName=StkContainer}">
<TextBlock Foreground="{DynamicResource DARKPrimaryText}" FontSize="12" Width="37" <TextBlock Foreground="{DynamicResource DARKPrimaryText}" FontSize="12" Width="37"
Padding="0" VerticalAlignment="Center" Text="{Binding Key}" /> Padding="0" VerticalAlignment="Center" Text="{Binding Key}" />
<TextBlock Text="：" <TextBlock Text="："
@ -206,7 +206,7 @@
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border x:Name="BdrImage" Margin="10,35,0,10" CornerRadius="5" <Border x:Name="BdrImage" Margin="10,35,0,10" CornerRadius="5"
Visibility="{Binding IsChecked,Converter={StaticResource {x:Static pu:ConverterKeys.TrueToCollapseConverter}}, ElementName=TbtnDetail}"> Visibility="{Binding IsChecked,Converter={x:Static pu:Converters.TrueToCollapseConverter}, ElementName=TbtnDetail}">
<Image Source="{Binding ImageSource}" Stretch="UniformToFill" /> <Image Source="{Binding ImageSource}" Stretch="UniformToFill" />
</Border> </Border>
<ToggleButton x:Name="TbtnStar" Grid.ColumnSpan="2" Margin="0,5,32,0" HorizontalAlignment="Right" <ToggleButton x:Name="TbtnStar" Grid.ColumnSpan="2" Margin="0,5,32,0" HorizontalAlignment="Right"

30
VPet.Solution/App.xaml
View File

@ -1,17 +1,15 @@
<Application <Application x:Class="VPet.Solution.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
x:Class="VPet.Solution.App" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" StartupUri="Views/MainWindow.xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <Application.Resources>
StartupUri="Views/MainWindow.xaml"> <ResourceDictionary>
<Application.Resources> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary> <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
<ResourceDictionary.MergedDictionaries> <pu:StyleDictionary Includes="All" />
<ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" /> <ResourceDictionary Source="Converters.xaml" />
<ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" /> <ResourceDictionary Source="Templates.xaml" />
<ResourceDictionary Source="Converters.xaml" /> <ResourceDictionary Source="Styles.xaml" />
<ResourceDictionary Source="Templates.xaml" /> </ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Styles.xaml" /> </ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </Application.Resources>
</ResourceDictionary>
</Application.Resources>
</Application> </Application>

21
VPet.Solution/NativeStyles.xaml
View File

@ -1,12 +1,11 @@
<ResourceDictionary <ResourceDictionary x:Class="VPet.Solution.NativeStyles" xmlns:pu="https://opensource.panuon.com/wpf-ui"
x:Class="VPet.Solution.NativeStyles" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
<ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" /> <pu:StyleDictionary Includes="All" />
<ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" /> <ResourceDictionary Source="Converters.xaml" />
<ResourceDictionary Source="Converters.xaml" /> <ResourceDictionary Source="Templates.xaml" />
<ResourceDictionary Source="Templates.xaml" /> <ResourceDictionary Source="Styles.xaml" />
<ResourceDictionary Source="Styles.xaml" /> </ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary> </ResourceDictionary>

350
VPet.Solution/Styles.xaml
View File

@ -1,133 +1,98 @@
<ResourceDictionary <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pu="https://opensource.panuon.com/wpf-ui">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <ResourceDictionary.MergedDictionaries>
xmlns:pu="https://opensource.panuon.com/wpf-ui"> <pu:StyleDictionary Includes="All" />
<ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" /> <Style x:Key="Button_Add" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
</ResourceDictionary.MergedDictionaries> <Setter Property="Background" Value="{StaticResource DARKPrimary}" />
<Style <Setter Property="pu:ButtonHelper.ShadowColor" Value="{StaticResource ShadowColor}" />
x:Key="Button_Add" <Setter Property="FontSize" Value="24" />
BasedOn="{StaticResource {x:Type Button}}" <Setter Property="Padding" Value="10" />
TargetType="Button"> <Setter Property="Margin" Value="10" />
<Setter Property="Background" Value="{StaticResource DARKPrimary}" /> <Setter Property="pu:ButtonHelper.CornerRadius" Value="24" />
<Setter Property="pu:ButtonHelper.ShadowColor" Value="{StaticResource ShadowColor}" /> </Style>
<Setter Property="FontSize" Value="24" /> <Style x:Key="Button_Cancel" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
<Setter Property="Padding" Value="10" /> <Setter Property="Background" Value="{StaticResource PrimaryLight}" />
<Setter Property="Margin" Value="10" /> <Setter Property="Foreground" Value="{StaticResource SecondaryText}" />
<Setter Property="pu:ButtonHelper.CornerRadius" Value="24" /> </Style>
</Style> <Style x:Key="Button_HiddenOnTagNull" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
<Style <Setter Property="Visibility" Value="Hidden" />
x:Key="Button_Cancel" <Style.Triggers>
BasedOn="{StaticResource ThemedButtonStyle}" <DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
TargetType="Button"> <Setter Property="Visibility" Value="Visible" />
<Setter Property="Background" Value="{StaticResource PrimaryLight}" /> </DataTrigger>
<Setter Property="Foreground" Value="{StaticResource SecondaryText}" /> </Style.Triggers>
</Style> </Style>
<Style <Style x:Key="Button_CollapsedOnTagNull" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
x:Key="Button_HiddenOnTagNull" <Setter Property="Visibility" Value="Collapsed" />
BasedOn="{StaticResource ThemedButtonStyle}" <Style.Triggers>
TargetType="Button"> <DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
<Setter Property="Visibility" Value="Hidden" /> <Setter Property="Visibility" Value="Visible" />
<Style.Triggers> </DataTrigger>
<DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}"> </Style.Triggers>
<Setter Property="Visibility" Value="Visible" /> </Style>
</DataTrigger> <Style x:Key="TextBlock_Wrap" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
</Style.Triggers> <Setter Property="TextWrapping" Value="Wrap" />
</Style> <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
<Style </Style>
x:Key="Button_CollapsedOnTagNull" <Style x:Key="TextBlock_BaseStyle" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
BasedOn="{StaticResource ThemedButtonStyle}" <Setter Property="Margin" Value="5" />
TargetType="Button"> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Visibility" Value="Collapsed" /> <Setter Property="HorizontalAlignment" Value="Center" />
<Style.Triggers> <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
<DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}"> </Style>
<Setter Property="Visibility" Value="Visible" /> <Style x:Key="TextBlock_LeftCenter" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
</DataTrigger> <Setter Property="VerticalAlignment" Value="Center" />
</Style.Triggers> <Setter Property="HorizontalAlignment" Value="Left" />
</Style> <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
<Style </Style>
x:Key="TextBlock_Wrap" <Style x:Key="TextBox_Wrap" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
BasedOn="{StaticResource {x:Type TextBlock}}" <Setter Property="TextWrapping" Value="Wrap" />
TargetType="TextBlock"> <Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="TextWrapping" Value="Wrap" /> <Setter Property="VerticalContentAlignment" Value="Top" />
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" /> <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
</Style> </Style>
<Style <Style x:Key="TextBox_Center" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
x:Key="TextBlock_BaseStyle" <Setter Property="VerticalAlignment" Value="Center" />
BasedOn="{StaticResource {x:Type TextBlock}}" <Setter Property="HorizontalAlignment" Value="Center" />
TargetType="TextBlock"> <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
<Setter Property="Margin" Value="5" /> </Style>
<Setter Property="VerticalAlignment" Value="Center" /> <Style x:Key="TextBox_LeftCenter" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" /> <Setter Property="HorizontalAlignment" Value="Left" />
</Style> <Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
<Style </Style>
x:Key="TextBlock_LeftCenter" <Style x:Key="WindowXStyle" TargetType="pu:WindowX">
BasedOn="{StaticResource {x:Type TextBlock}}" <Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
TargetType="TextBlock"> <Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="VerticalAlignment" Value="Center" /> </Style>
<Setter Property="HorizontalAlignment" Value="Left" /> <Style x:Key="Menu_Style" BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}" TargetType="Menu">
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" /> <Setter Property="Height" Value="NaN" />
</Style> <Setter Property="Margin" Value="0" />
<Style <Setter Property="BorderThickness" Value="0" />
x:Key="TextBox_Wrap" <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
BasedOn="{StaticResource {x:Type TextBox}}" <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
TargetType="TextBox"> <Setter Property="pu:MenuHelper.CornerRadius" Value="4" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="VerticalContentAlignment" Value="Top" />
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
</Style>
<Style
x:Key="TextBox_Center"
BasedOn="{StaticResource {x:Type TextBox}}"
TargetType="TextBox">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
</Style>
<Style
x:Key="TextBox_LeftCenter"
BasedOn="{StaticResource {x:Type TextBox}}"
TargetType="TextBox">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
</Style>
<Style x:Key="WindowXStyle" TargetType="pu:WindowX">
<Setter Property="pu:WindowXCaption.Background" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:WindowXCaption.Foreground" Value="{DynamicResource DARKPrimaryText}" />
</Style>
<Style
x:Key="Menu_Style"
BasedOn="{StaticResource {x:Static pu:StyleKeys.MenuStyle}}"
TargetType="Menu">
<Setter Property="Height" Value="NaN" />
<Setter Property="Margin" Value="0" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:MenuHelper.CornerRadius" Value="4" />
<Setter Property="pu:DropDownHelper.CornerRadius" Value="4" /> <Setter Property="pu:DropDownHelper.CornerRadius" Value="4" />
<!-- --> <!-- -->
<Setter Property="pu:MenuHelper.TopLevelItemsBorderThickness" Value="0" /> <Setter Property="pu:MenuHelper.TopLevelItemsBorderThickness" Value="0" />
<Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="5,0,5,0" /> <Setter Property="pu:MenuHelper.TopLevelItemsPadding" Value="5,0,5,0" />
<Setter Property="pu:MenuHelper.TopLevelItemsMargin" Value="0" /> <Setter Property="pu:MenuHelper.TopLevelItemsMargin" Value="0" />
<Setter Property="pu:MenuHelper.TopLevelItemsHorizontalContentAlignment" Value="Center" /> <Setter Property="pu:MenuHelper.TopLevelItemsHorizontalContentAlignment" Value="Center" />
<Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:MenuHelper.TopLevelItemsBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:MenuHelper.TopLevelItemsForeground" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:MenuHelper.TopLevelItemsForeground" Value="{DynamicResource DARKPrimaryText}" />
<!-- --> <!-- -->
<Setter Property="pu:MenuHelper.SubmenuItemsBorderThickness" Value="0" /> <Setter Property="pu:MenuHelper.SubmenuItemsBorderThickness" Value="0" />
<Setter Property="pu:MenuHelper.SubmenuItemsBorderBrush" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:MenuHelper.SubmenuItemsBorderBrush" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="NaN" /> <Setter Property="pu:MenuHelper.SubmenuItemsWidth" Value="NaN" />
<Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="NaN" /> <Setter Property="pu:MenuHelper.SubmenuItemsHeight" Value="NaN" />
<Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="5" /> <Setter Property="pu:MenuHelper.SubmenuItemsPadding" Value="5" />
<Setter Property="pu:MenuHelper.SubmenuItemsMargin" Value="0" /> <Setter Property="pu:MenuHelper.SubmenuItemsMargin" Value="0" />
<!--<Setter Property="pu:MenuHelper.SubmenuItemsCornerRadius" Value="4" />--> <!--<Setter Property="pu:MenuHelper.SubmenuItemsCornerRadius" Value="4" />-->
<Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="{DynamicResource DARKPrimary}" /> <Setter Property="pu:MenuHelper.SubmenuItemsBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="pu:MenuHelper.SubmenuItemsForeground" Value="{DynamicResource DARKPrimaryText}" />
<!--<Setter Property="Width" Value="NaN" /> <!--<Setter Property="Width" Value="NaN" />
<Setter Property="Height" Value="NaN" /> <Setter Property="Height" Value="NaN" />
<Setter Property="Padding" Value="5" /> <Setter Property="Padding" Value="5" />
<Setter Property="Background" Value="{DynamicResource BackgroundColor}" /> <Setter Property="Background" Value="{DynamicResource BackgroundColor}" />
@ -136,73 +101,62 @@
<Setter Property="pu:MenuItemHelper.HoverBackground" Value="{DynamicResource HoverColor}" /> <Setter Property="pu:MenuItemHelper.HoverBackground" Value="{DynamicResource HoverColor}" />
<Setter Property="pu:MenuItemHelper.ClickBackground" Value="{DynamicResource ClickColor}" /> <Setter Property="pu:MenuItemHelper.ClickBackground" Value="{DynamicResource ClickColor}" />
<Setter Property="pu:MenuItemHelper.CheckedBackground" Value="{DynamicResource CheckedColor}" />--> <Setter Property="pu:MenuItemHelper.CheckedBackground" Value="{DynamicResource CheckedColor}" />-->
</Style> </Style>
<Style x:Key="Switch_BaseStyle" TargetType="pu:Switch"> <Style x:Key="Switch_BaseStyle" TargetType="pu:Switch">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Margin" Value="5" /> <Setter Property="Margin" Value="5" />
<Setter Property="Background" Value="{x:Null}" /> <Setter Property="Background" Value="{x:Null}" />
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryDark}" /> <Setter Property="BorderBrush" Value="{DynamicResource PrimaryDark}" />
<Setter Property="BoxHeight" Value="20" /> <Setter Property="BoxHeight" Value="20" />
<Setter Property="CheckedBackground" Value="{DynamicResource Primary}" /> <Setter Property="CheckedBackground" Value="{DynamicResource Primary}" />
<Setter Property="CheckedBorderBrush" Value="{DynamicResource Primary}" /> <Setter Property="CheckedBorderBrush" Value="{DynamicResource Primary}" />
<Setter Property="CheckedToggleBrush" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="CheckedToggleBrush" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="ToggleBrush" Value="{DynamicResource PrimaryDark}" /> <Setter Property="ToggleBrush" Value="{DynamicResource PrimaryDark}" />
<Setter Property="ToggleShadowColor" Value="{x:Null}" /> <Setter Property="ToggleShadowColor" Value="{x:Null}" />
<Setter Property="ToggleSize" Value="14" /> <Setter Property="ToggleSize" Value="14" />
</Style> </Style>
<Style x:Key="Label_BaseStyle" TargetType="Label"> <Style x:Key="Label_BaseStyle" TargetType="Label">
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="Margin" Value="10,5,10,5" /> <Setter Property="Margin" Value="10,5,10,5" />
<Setter Property="Height" Value="30" /> <Setter Property="Height" Value="30" />
<Setter Property="HorizontalContentAlignment" Value="Center" /> <Setter Property="HorizontalContentAlignment" Value="Center" />
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Background" Value="{x:Null}" /> <Setter Property="Background" Value="{x:Null}" />
</Style> </Style>
<Style x:Key="NumberInput_BaseStyle" TargetType="pu:NumberInput"> <Style x:Key="NumberInput_BaseStyle" TargetType="pu:NumberInput">
<Setter Property="Height" Value="30" /> <Setter Property="Height" Value="30" />
<Setter Property="Margin" Value="5" /> <Setter Property="Margin" Value="5" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Background" Value="{x:Null}" /> <Setter Property="Background" Value="{x:Null}" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="FontWeight" Value="Bold" />
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDarker}" /> <Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDarker}" />
</Style> </Style>
<Style <Style x:Key="Button_BaseStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
x:Key="Button_BaseStyle" <Setter Property="Margin" Value="5" />
BasedOn="{StaticResource {x:Type Button}}" <Setter Property="Padding" Value="5" />
TargetType="Button"> <Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Padding" Value="5" /> <Setter Property="pu:ButtonHelper.CornerRadius" Value="4" />
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="Background" Value="{DynamicResource SecondaryLight}" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
<Setter Property="pu:ButtonHelper.CornerRadius" Value="4" /> <Setter Property="BorderThickness" Value="2" />
<Setter Property="Background" Value="{DynamicResource SecondaryLight}" /> </Style>
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" /> <Style x:Key="ComboBox_BaseStyle" BasedOn="{StaticResource StandardComboBoxStyle}" TargetType="ComboBox">
<Setter Property="BorderThickness" Value="2" /> <Setter Property="Margin" Value="5" />
</Style> </Style>
<Style <Style x:Key="Expander_BaseStyle" BasedOn="{StaticResource {x:Static pu:StyleKeys.ExpanderStyle}}"
x:Key="ComboBox_BaseStyle" TargetType="Expander">
BasedOn="{StaticResource StandardComboBoxStyle}" <Setter Property="Margin" Value="10" />
TargetType="ComboBox"> <Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
<Setter Property="Margin" Value="5" /> <Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
</Style> <Setter Property="BorderThickness" Value="2" />
<Style <Setter Property="pu:ExpanderHelper.CornerRadius" Value="4" />
x:Key="Expander_BaseStyle" <Setter Property="pu:ExpanderHelper.ToggleArrowPlacement" Value="Right" />
BasedOn="{StaticResource {x:Static pu:StyleKeys.ExpanderStyle}}" </Style>
TargetType="Expander"> <Style x:Key="Slider_BaseStyle" BasedOn="{StaticResource StandardSliderStyle}" TargetType="Slider">
<Setter Property="Margin" Value="10" /> <Setter Property="IsSnapToTickEnabled" Value="True" />
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" /> <Setter Property="Margin" Value="5" />
<Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="BorderThickness" Value="2" /> </Style>
<Setter Property="pu:ExpanderHelper.CornerRadius" Value="4" />
<Setter Property="pu:ExpanderHelper.ToggleArrowPlacement" Value="Right" />
</Style>
<Style
x:Key="Slider_BaseStyle"
BasedOn="{StaticResource StandardSliderStyle}"
TargetType="Slider">
<Setter Property="IsSnapToTickEnabled" Value="True" />
<Setter Property="Margin" Value="5" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
</ResourceDictionary> </ResourceDictionary>

6
VPet.Solution/VPet.Solution.csproj
View File

@ -20,11 +20,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="FastMember" Version="1.5.0" /> <PackageReference Include="FastMember" Version="1.5.0" />
<PackageReference Include="LinePutScript" Version="1.11.3" /> <PackageReference Include="LinePutScript" Version="1.11.4" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Panuon.WPF" Version="1.0.4" /> <PackageReference Include="Panuon.WPF" Version="1.1.0" />
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>