mirror of
https://github.com/LorisYounger/VPet.git
synced 2024-08-30 18:42:36 +00:00
更新PUI
This commit is contained in:
ZouJin
parent
c5047a7581
commit
649ebf133b
@ -1,17 +1,11 @@
|
||||
<ResourceDictionary
|
||||
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"
|
||||
<ResourceDictionary 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:pucore="clr-namespace:Panuon.WPF;assembly=Panuon.WPF">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<pucore:SharedResourceDictionary Source="/Panuon.WPF.UI;component/Control.xaml" />
|
||||
<pu:StyleDictionary Includes="All" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<DrawingBrush
|
||||
x:Key="ProgressBarForeground"
|
||||
Stretch="None"
|
||||
TileMode="Tile"
|
||||
Viewport="0,0,8,22"
|
||||
<DrawingBrush x:Key="ProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
|
||||
ViewportUnits="Absolute">
|
||||
<DrawingBrush.RelativeTransform>
|
||||
<RotateTransform Angle="2" />
|
||||
@ -35,11 +29,7 @@
|
||||
</DrawingGroup>
|
||||
</DrawingBrush.Drawing>
|
||||
</DrawingBrush>
|
||||
<DrawingBrush
|
||||
x:Key="SuccessProgressBarForeground"
|
||||
Stretch="None"
|
||||
TileMode="Tile"
|
||||
Viewport="0,0,8,22"
|
||||
<DrawingBrush x:Key="SuccessProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
|
||||
ViewportUnits="Absolute">
|
||||
<DrawingBrush.RelativeTransform>
|
||||
<RotateTransform Angle="2" />
|
||||
@ -63,11 +53,7 @@
|
||||
</DrawingGroup>
|
||||
</DrawingBrush.Drawing>
|
||||
</DrawingBrush>
|
||||
<DrawingBrush
|
||||
x:Key="WarningProgressBarForeground"
|
||||
Stretch="None"
|
||||
TileMode="Tile"
|
||||
Viewport="0,0,8,22"
|
||||
<DrawingBrush x:Key="WarningProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
|
||||
ViewportUnits="Absolute">
|
||||
<DrawingBrush.RelativeTransform>
|
||||
<RotateTransform Angle="2" />
|
||||
@ -91,11 +77,7 @@
|
||||
</DrawingGroup>
|
||||
</DrawingBrush.Drawing>
|
||||
</DrawingBrush>
|
||||
<DrawingBrush
|
||||
x:Key="DangerProgressBarForeground"
|
||||
Stretch="None"
|
||||
TileMode="Tile"
|
||||
Viewport="0,0,8,22"
|
||||
<DrawingBrush x:Key="DangerProgressBarForeground" Stretch="None" TileMode="Tile" Viewport="0,0,8,22"
|
||||
ViewportUnits="Absolute">
|
||||
<DrawingBrush.RelativeTransform>
|
||||
<RotateTransform Angle="2" />
|
||||
@ -133,20 +115,14 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="ThemedButtonStyle"
|
||||
BasedOn="{StaticResource {x:Type Button}}"
|
||||
TargetType="{x:Type Button}">
|
||||
<Style x:Key="ThemedButtonStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
|
||||
<Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
|
||||
<Setter Property="Padding" Value="10,5" />
|
||||
<Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="TextButtonStyle"
|
||||
BasedOn="{StaticResource {x:Type Button}}"
|
||||
TargetType="{x:Type Button}">
|
||||
<Style x:Key="TextButtonStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
|
||||
<Setter Property="Cursor" Value="Hand" />
|
||||
@ -154,16 +130,11 @@
|
||||
<Setter Property="FontSize" Value="12" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="DARKPrimaryTextButtonStyle"
|
||||
BasedOn="{StaticResource TextButtonStyle}"
|
||||
TargetType="{x:Type Button}">
|
||||
<Style x:Key="DARKPrimaryTextButtonStyle" BasedOn="{StaticResource TextButtonStyle}" TargetType="{x:Type Button}">
|
||||
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryText}" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="IconInvertedForegroundRepeatButtonStyle"
|
||||
BasedOn="{StaticResource {x:Type RepeatButton}}"
|
||||
<Style x:Key="IconInvertedForegroundRepeatButtonStyle" BasedOn="{StaticResource {x:Type RepeatButton}}"
|
||||
TargetType="{x:Type RepeatButton}">
|
||||
<Setter Property="Width" Value="25" />
|
||||
<Setter Property="Height" Value="25" />
|
||||
@ -175,10 +146,7 @@
|
||||
<Setter Property="FontFamily" Value="pack://application:,,,/Res/#remixicon" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="LinkButtonStyle"
|
||||
BasedOn="{StaticResource TextButtonStyle}"
|
||||
TargetType="{x:Type Button}">
|
||||
<Style x:Key="LinkButtonStyle" BasedOn="{StaticResource TextButtonStyle}" TargetType="{x:Type Button}">
|
||||
<Setter Property="ContentTemplate">
|
||||
<Setter.Value>
|
||||
<DataTemplate>
|
||||
@ -188,9 +156,7 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="StndardToggleButtonStyle"
|
||||
BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||
<Style x:Key="StndardToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||
TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="Background" Value="{DynamicResource DARKPrimary}" />
|
||||
<Setter Property="pu:ToggleButtonHelper.CheckedBackground" Value="{DynamicResource DARKPrimaryDarker}" />
|
||||
@ -199,9 +165,7 @@
|
||||
<Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="TextToggleButtonStyle"
|
||||
BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||
<Style x:Key="TextToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
|
||||
TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource PrimaryDarker}" />
|
||||
@ -210,9 +174,7 @@
|
||||
<Setter Property="FontSize" Value="14" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="LinkToggleButtonStyle"
|
||||
BasedOn="{StaticResource TextToggleButtonStyle}"
|
||||
<Style x:Key="LinkToggleButtonStyle" BasedOn="{StaticResource TextToggleButtonStyle}"
|
||||
TargetType="{x:Type ToggleButton}">
|
||||
<Setter Property="ContentTemplate">
|
||||
<Setter.Value>
|
||||
@ -233,10 +195,7 @@
|
||||
<Setter Property="ItemsCornerRadius" Value="2" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="StandardComboBoxStyle"
|
||||
BasedOn="{StaticResource {x:Type ComboBox}}"
|
||||
TargetType="{x:Type ComboBox}">
|
||||
<Style x:Key="StandardComboBoxStyle" BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="{x:Type ComboBox}">
|
||||
<Setter Property="FontSize" Value="14" />
|
||||
<Setter Property="Height" Value="30" />
|
||||
<Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
|
||||
@ -260,7 +219,8 @@
|
||||
<Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
|
||||
<Setter Property="pu:ComboBoxHelper.ToggleArrowTransformControlStyle">
|
||||
<Setter.Value>
|
||||
<Style BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyleKey}}" TargetType="pu:TransformControl">
|
||||
<Style BasedOn="{StaticResource {x:Static pu:ComboBoxHelper.ToggleArrowTransformControlStyleKey}}"
|
||||
TargetType="pu:TransformControl">
|
||||
<Setter Property="Foreground" Value="{DynamicResource PrimaryText}" />
|
||||
<Setter Property="FontSize" Value="10" />
|
||||
<Setter Property="Content" Value="" />
|
||||
@ -268,10 +228,7 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="StandardTextBoxStyle"
|
||||
BasedOn="{StaticResource {x:Type TextBox}}"
|
||||
TargetType="TextBox">
|
||||
<Style x:Key="StandardTextBoxStyle" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
|
||||
<Setter Property="FontSize" Value="14" />
|
||||
<Setter Property="Height" Value="30" />
|
||||
<Setter Property="Background" Value="{DynamicResource DARKPrimaryText}" />
|
||||
@ -283,10 +240,7 @@
|
||||
<Setter Property="pu:ShadowHelper.BlurRadius" Value="15" />
|
||||
<Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="StandardSliderStyle"
|
||||
BasedOn="{StaticResource {x:Type Slider}}"
|
||||
TargetType="Slider">
|
||||
<Style x:Key="StandardSliderStyle" BasedOn="{StaticResource {x:Type Slider}}" TargetType="Slider">
|
||||
<Setter Property="Background" Value="{DynamicResource DARKPrimaryTrans4}" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDark}" />
|
||||
<Setter Property="pu:SliderHelper.ThumbShadowColor" Value="{DynamicResource ShadowColor}" />
|
||||
@ -299,18 +253,12 @@
|
||||
<Setter Property="pu:ShadowHelper.Opacity" Value="0.5" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="StandardRadioButtonStyle"
|
||||
BasedOn="{StaticResource {x:Type RadioButton}}"
|
||||
TargetType="RadioButton">
|
||||
<Style x:Key="StandardRadioButtonStyle" BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
|
||||
<Setter Property="pu:RadioButtonHelper.CheckedToggleBrush" Value="{DynamicResource DARKPrimary}" />
|
||||
<Setter Property="pu:RadioButtonHelper.CheckedBorderBrush" Value="{DynamicResource DARKPrimary}" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="SideMenuListBoxStyle"
|
||||
BasedOn="{StaticResource {x:Type ListBox}}"
|
||||
TargetType="ListBox">
|
||||
<Style x:Key="SideMenuListBoxStyle" BasedOn="{StaticResource {x:Type ListBox}}" TargetType="ListBox">
|
||||
<Setter Property="BorderThickness" Value="0" />
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="pu:ListBoxHelper.ItemsHeight" Value="30" />
|
||||
@ -321,10 +269,7 @@
|
||||
<Setter Property="pu:ListBoxHelper.ItemsSelectedForeground" Value="{DynamicResource DARKPrimaryText}" />
|
||||
</Style>
|
||||
|
||||
<Style
|
||||
x:Key="ToolBarMenuStyle"
|
||||
BasedOn="{StaticResource {x:Type Menu}}"
|
||||
TargetType="Menu">
|
||||
<Style x:Key="ToolBarMenuStyle" BasedOn="{StaticResource {x:Type Menu}}" TargetType="Menu">
|
||||
<Setter Property="Height" Value="55" />
|
||||
<Setter Property="FontSize" Value="24" />
|
||||
<Setter Property="VerticalContentAlignment" Value="Center" />
|
||||
|
||||
@ -23,10 +23,10 @@
|
||||
<None Include="..\.editorconfig" Link=".editorconfig" />
|
||||
</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="Panuon.WPF" Version="1.0.4" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
|
||||
<PackageReference Include="Panuon.WPF" Version="1.1.0" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="Properties\Resources.Designer.cs">
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
<ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />
|
||||
</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="Panuon.WPF" Version="1.0.4" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
|
||||
<PackageReference Include="Panuon.WPF" Version="1.1.0" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@ -214,12 +214,12 @@
|
||||
<ItemGroup>
|
||||
<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="LinePutScript" Version="1.11.3" />
|
||||
<PackageReference Include="LinePutScript" Version="1.11.4" />
|
||||
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.6" />
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
|
||||
<PackageReference Include="NAudio" Version="2.2.1" />
|
||||
<PackageReference Include="Panuon.WPF" Version="1.0.4" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
|
||||
<PackageReference Include="Panuon.WPF" Version="1.1.0" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />
|
||||
|
||||
@ -177,7 +177,7 @@
|
||||
<ItemsControl.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<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"
|
||||
Padding="0" VerticalAlignment="Center" Text="{Binding Key}" />
|
||||
<TextBlock Text="："
|
||||
@ -206,7 +206,7 @@
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<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" />
|
||||
</Border>
|
||||
<ToggleButton x:Name="TbtnStar" Grid.ColumnSpan="2" Margin="0,5,32,0" HorizontalAlignment="Right"
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
<Application
|
||||
x:Class="VPet.Solution.App"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
<Application x:Class="VPet.Solution.App" 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"
|
||||
StartupUri="Views/MainWindow.xaml">
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
|
||||
<pu:StyleDictionary Includes="All" />
|
||||
<ResourceDictionary Source="Converters.xaml" />
|
||||
<ResourceDictionary Source="Templates.xaml" />
|
||||
<ResourceDictionary Source="Styles.xaml" />
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
<ResourceDictionary
|
||||
x:Class="VPet.Solution.NativeStyles"
|
||||
<ResourceDictionary x:Class="VPet.Solution.NativeStyles" xmlns:pu="https://opensource.panuon.com/wpf-ui"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
|
||||
<ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
|
||||
<pu:StyleDictionary Includes="All" />
|
||||
<ResourceDictionary Source="Converters.xaml" />
|
||||
<ResourceDictionary Source="Templates.xaml" />
|
||||
<ResourceDictionary Source="Styles.xaml" />
|
||||
|
||||
@ -1,14 +1,9 @@
|
||||
<ResourceDictionary
|
||||
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">
|
||||
<ResourceDictionary 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">
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
|
||||
<pu:StyleDictionary Includes="All" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
<Style
|
||||
x:Key="Button_Add"
|
||||
BasedOn="{StaticResource {x:Type Button}}"
|
||||
TargetType="Button">
|
||||
<Style x:Key="Button_Add" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
|
||||
<Setter Property="Background" Value="{StaticResource DARKPrimary}" />
|
||||
<Setter Property="pu:ButtonHelper.ShadowColor" Value="{StaticResource ShadowColor}" />
|
||||
<Setter Property="FontSize" Value="24" />
|
||||
@ -16,17 +11,11 @@
|
||||
<Setter Property="Margin" Value="10" />
|
||||
<Setter Property="pu:ButtonHelper.CornerRadius" Value="24" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="Button_Cancel"
|
||||
BasedOn="{StaticResource ThemedButtonStyle}"
|
||||
TargetType="Button">
|
||||
<Style x:Key="Button_Cancel" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
|
||||
<Setter Property="Background" Value="{StaticResource PrimaryLight}" />
|
||||
<Setter Property="Foreground" Value="{StaticResource SecondaryText}" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="Button_HiddenOnTagNull"
|
||||
BasedOn="{StaticResource ThemedButtonStyle}"
|
||||
TargetType="Button">
|
||||
<Style x:Key="Button_HiddenOnTagNull" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
|
||||
<Setter Property="Visibility" Value="Hidden" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
|
||||
@ -34,10 +23,7 @@
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="Button_CollapsedOnTagNull"
|
||||
BasedOn="{StaticResource ThemedButtonStyle}"
|
||||
TargetType="Button">
|
||||
<Style x:Key="Button_CollapsedOnTagNull" BasedOn="{StaticResource ThemedButtonStyle}" TargetType="Button">
|
||||
<Setter Property="Visibility" Value="Collapsed" />
|
||||
<Style.Triggers>
|
||||
<DataTrigger Binding="{Binding Tag, RelativeSource={RelativeSource Mode=Self}}" Value="{x:Null}">
|
||||
@ -45,51 +31,33 @@
|
||||
</DataTrigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="TextBlock_Wrap"
|
||||
BasedOn="{StaticResource {x:Type TextBlock}}"
|
||||
TargetType="TextBlock">
|
||||
<Style x:Key="TextBlock_Wrap" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
|
||||
<Setter Property="TextWrapping" Value="Wrap" />
|
||||
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="TextBlock_BaseStyle"
|
||||
BasedOn="{StaticResource {x:Type TextBlock}}"
|
||||
TargetType="TextBlock">
|
||||
<Style x:Key="TextBlock_BaseStyle" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
|
||||
<Setter Property="Margin" Value="5" />
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="TextBlock_LeftCenter"
|
||||
BasedOn="{StaticResource {x:Type TextBlock}}"
|
||||
TargetType="TextBlock">
|
||||
<Style x:Key="TextBlock_LeftCenter" BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="TextBlock">
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||
<Setter Property="ToolTip" Value="{Binding Text, RelativeSource={RelativeSource Mode=Self}}" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="TextBox_Wrap"
|
||||
BasedOn="{StaticResource {x:Type TextBox}}"
|
||||
TargetType="TextBox">
|
||||
<Style x:Key="TextBox_Wrap" BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
|
||||
<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">
|
||||
<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">
|
||||
<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}}" />
|
||||
@ -98,10 +66,7 @@
|
||||
<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">
|
||||
<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" />
|
||||
@ -167,10 +132,7 @@
|
||||
<Setter Property="FontWeight" Value="Bold" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource DARKPrimaryDarker}" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="Button_BaseStyle"
|
||||
BasedOn="{StaticResource {x:Type Button}}"
|
||||
TargetType="Button">
|
||||
<Style x:Key="Button_BaseStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
|
||||
<Setter Property="Margin" Value="5" />
|
||||
<Setter Property="Padding" Value="5" />
|
||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||
@ -180,15 +142,10 @@
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
|
||||
<Setter Property="BorderThickness" Value="2" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="ComboBox_BaseStyle"
|
||||
BasedOn="{StaticResource StandardComboBoxStyle}"
|
||||
TargetType="ComboBox">
|
||||
<Style x:Key="ComboBox_BaseStyle" BasedOn="{StaticResource StandardComboBoxStyle}" TargetType="ComboBox">
|
||||
<Setter Property="Margin" Value="5" />
|
||||
</Style>
|
||||
<Style
|
||||
x:Key="Expander_BaseStyle"
|
||||
BasedOn="{StaticResource {x:Static pu:StyleKeys.ExpanderStyle}}"
|
||||
<Style x:Key="Expander_BaseStyle" BasedOn="{StaticResource {x:Static pu:StyleKeys.ExpanderStyle}}"
|
||||
TargetType="Expander">
|
||||
<Setter Property="Margin" Value="10" />
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryDark}" />
|
||||
@ -197,10 +154,7 @@
|
||||
<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">
|
||||
<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" />
|
||||
|
||||
@ -20,11 +20,11 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<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="Microsoft.CSharp" Version="4.7.0" />
|
||||
<PackageReference Include="Panuon.WPF" Version="1.0.4" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.1.17.6" />
|
||||
<PackageReference Include="Panuon.WPF" Version="1.1.0" />
|
||||
<PackageReference Include="Panuon.WPF.UI" Version="1.2.0.1" />
|
||||
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Loading…
Reference in New Issue
Block a user