add:新设置
This commit is contained in:
@@ -66,12 +66,12 @@
|
|||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<StackPanel Name="UpdateAvailablePanel" Visibility="Collapsed" Margin="0,0,0,20">
|
<StackPanel Name="UpdateAvailablePanel" Visibility="Collapsed" Margin="0,0,0,20">
|
||||||
<Border BorderBrush="#e6e6e6" BorderThickness="1" CornerRadius="8" Padding="16" Background="#F9F9F9">
|
<Border x:Name="UpdateAvailableBorder" BorderThickness="1" CornerRadius="8" Padding="16">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Foreground="#2e3436" FontSize="16" FontWeight="SemiBold" Text="可用更新" Margin="0,0,0,8"/>
|
<TextBlock Foreground="#2e3436" FontSize="16" FontWeight="SemiBold" Text="可用更新" Margin="0,0,0,8"/>
|
||||||
<TextBlock Name="LatestVersionText" Foreground="#878787" FontSize="14" Text="" TextWrapping="Wrap" Margin="0,0,0,16"/>
|
<TextBlock Name="LatestVersionText" Foreground="#878787" FontSize="14" Text="" TextWrapping="Wrap" Margin="0,0,0,16"/>
|
||||||
<StackPanel Orientation="Vertical">
|
<ui:SimpleStackPanel Orientation="Vertical" Spacing="12">
|
||||||
<Button Name="UpdateNowButton" Content="立即下载并安装" HorizontalAlignment="Left" Padding="20,10" FontSize="14" FontWeight="SemiBold" Cursor="Hand" Click="UpdateNowButton_Click" Background="#0078D4" Foreground="White" BorderThickness="0" MinWidth="200" Margin="0,0,0,12">
|
<Button Name="UpdateNowButton" Content="立即下载并安装" HorizontalAlignment="Left" Padding="20,10" FontSize="14" FontWeight="SemiBold" Cursor="Hand" Click="UpdateNowButton_Click" Background="#2563eb" Foreground="White" BorderThickness="0" Height="40" MinWidth="200">
|
||||||
<Button.Template>
|
<Button.Template>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<Border Background="{TemplateBinding Background}" CornerRadius="6" Padding="{TemplateBinding Padding}">
|
<Border Background="{TemplateBinding Background}" CornerRadius="6" Padding="{TemplateBinding Padding}">
|
||||||
@@ -79,16 +79,20 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter Property="Background" Value="#005a9e"/>
|
<Setter Property="Background" Value="#1d4ed8"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsPressed" Value="True">
|
<Trigger Property="IsPressed" Value="True">
|
||||||
<Setter Property="Background" Value="#004578"/>
|
<Setter Property="Background" Value="#1e40af"/>
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="IsEnabled" Value="False">
|
||||||
|
<Setter Property="Background" Value="#9ca3af"/>
|
||||||
|
<Setter Property="Foreground" Value="#d1d5db"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Button.Template>
|
</Button.Template>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Name="UpdateLaterButton" Content="下载并在软件关闭时安装" HorizontalAlignment="Left" Padding="20,10" FontSize="14" FontWeight="Medium" Cursor="Hand" Click="UpdateLaterButton_Click" Background="Transparent" Foreground="#2e3436" BorderThickness="1" BorderBrush="#e6e6e6" MinWidth="200" Margin="0,0,0,12">
|
<Button Name="UpdateLaterButton" Content="下载并在软件关闭时安装" HorizontalAlignment="Left" Padding="20,10" FontSize="14" FontWeight="Medium" Cursor="Hand" Click="UpdateLaterButton_Click" BorderThickness="1" Height="40" MinWidth="200">
|
||||||
<Button.Template>
|
<Button.Template>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<Border Background="{TemplateBinding Background}" CornerRadius="6" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
|
<Border Background="{TemplateBinding Background}" CornerRadius="6" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
|
||||||
@@ -96,16 +100,24 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter Property="Background" Value="#f5f5f5"/>
|
<Setter Property="Background">
|
||||||
|
<Setter.Value>
|
||||||
|
<SolidColorBrush Color="#2563eb" Opacity="0.1"/>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsPressed" Value="True">
|
<Trigger Property="IsPressed" Value="True">
|
||||||
<Setter Property="Background" Value="#e8e8e8"/>
|
<Setter Property="Background">
|
||||||
|
<Setter.Value>
|
||||||
|
<SolidColorBrush Color="#2563eb" Opacity="0.2"/>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Button.Template>
|
</Button.Template>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Name="SkipVersionButton" Content="跳过该版本" HorizontalAlignment="Left" Padding="20,10" FontSize="14" FontWeight="Medium" Cursor="Hand" Click="SkipVersionButton_Click" Background="Transparent" Foreground="#0078D4" BorderThickness="0" MinWidth="200">
|
<Button Name="SkipVersionButton" Content="跳过该版本" HorizontalAlignment="Left" Padding="20,10" FontSize="14" FontWeight="Medium" Cursor="Hand" Click="SkipVersionButton_Click" Background="Transparent" BorderThickness="0" Height="40" MinWidth="200">
|
||||||
<Button.Template>
|
<Button.Template>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<Border Background="{TemplateBinding Background}" CornerRadius="6" Padding="{TemplateBinding Padding}">
|
<Border Background="{TemplateBinding Background}" CornerRadius="6" Padding="{TemplateBinding Padding}">
|
||||||
@@ -113,17 +125,24 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter Property="Background" Value="#f5f5f5"/>
|
<Setter Property="Background">
|
||||||
<Setter Property="Foreground" Value="#005a9e"/>
|
<Setter.Value>
|
||||||
|
<SolidColorBrush Color="#2563eb" Opacity="0.1"/>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsPressed" Value="True">
|
<Trigger Property="IsPressed" Value="True">
|
||||||
<Setter Property="Background" Value="#e8e8e8"/>
|
<Setter Property="Background">
|
||||||
|
<Setter.Value>
|
||||||
|
<SolidColorBrush Color="#2563eb" Opacity="0.2"/>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Button.Template>
|
</Button.Template>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</ui:SimpleStackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using MessageBox = System.Windows.MessageBox;
|
using MessageBox = iNKORE.UI.WPF.Modern.Controls.MessageBox;
|
||||||
using static Ink_Canvas.Helpers.AutoUpdateHelper;
|
using static Ink_Canvas.Helpers.AutoUpdateHelper;
|
||||||
|
|
||||||
namespace Ink_Canvas.Windows.SettingsViews
|
namespace Ink_Canvas.Windows.SettingsViews
|
||||||
@@ -970,6 +970,12 @@ namespace Ink_Canvas.Windows.SettingsViews
|
|||||||
{
|
{
|
||||||
ThemeHelper.ApplyThemeToControl(this);
|
ThemeHelper.ApplyThemeToControl(this);
|
||||||
|
|
||||||
|
if (UpdateAvailableBorder != null)
|
||||||
|
{
|
||||||
|
UpdateAvailableBorder.Background = ThemeHelper.GetBackgroundPrimaryBrush();
|
||||||
|
UpdateAvailableBorder.BorderBrush = ThemeHelper.GetBorderPrimaryBrush();
|
||||||
|
}
|
||||||
|
|
||||||
if (CheckUpdateButton != null)
|
if (CheckUpdateButton != null)
|
||||||
{
|
{
|
||||||
CheckUpdateButton.Background = ThemeHelper.GetButtonBackgroundBrush();
|
CheckUpdateButton.Background = ThemeHelper.GetButtonBackgroundBrush();
|
||||||
@@ -979,7 +985,7 @@ namespace Ink_Canvas.Windows.SettingsViews
|
|||||||
|
|
||||||
if (UpdateNowButton != null)
|
if (UpdateNowButton != null)
|
||||||
{
|
{
|
||||||
UpdateNowButton.Background = new SolidColorBrush(Color.FromRgb(0, 120, 212));
|
UpdateNowButton.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
|
||||||
UpdateNowButton.Foreground = Brushes.White;
|
UpdateNowButton.Foreground = Brushes.White;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -993,7 +999,7 @@ namespace Ink_Canvas.Windows.SettingsViews
|
|||||||
if (SkipVersionButton != null)
|
if (SkipVersionButton != null)
|
||||||
{
|
{
|
||||||
SkipVersionButton.Background = Brushes.Transparent;
|
SkipVersionButton.Background = Brushes.Transparent;
|
||||||
SkipVersionButton.Foreground = new SolidColorBrush(Color.FromRgb(0, 120, 212));
|
SkipVersionButton.Foreground = ThemeHelper.GetTextSecondaryBrush();
|
||||||
SkipVersionButton.BorderThickness = new Thickness(0);
|
SkipVersionButton.BorderThickness = new Thickness(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user