改了下标题栏
不会约定式提交
This commit is contained in:
PrefacedCorg
@@ -7,12 +7,14 @@
|
|||||||
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
||||||
xmlns:controls="clr-namespace:Ink_Canvas.Windows.Controls"
|
xmlns:controls="clr-namespace:Ink_Canvas.Windows.Controls"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
WindowStyle="None"
|
|
||||||
Title="云存储管理" Height="600" Width="900"
|
Title="云存储管理" Height="600" Width="900"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
ResizeMode="CanResize"
|
ResizeMode="CanResize"
|
||||||
AllowsTransparency="True"
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
Background="Transparent">
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
ui:WindowHelper.UseModernWindowStyle="True"
|
||||||
|
ui:TitleBar.Height="48">
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
@@ -76,64 +78,41 @@
|
|||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
|
|
||||||
<Border Background="{StaticResource WindowBackground}"
|
<Grid>
|
||||||
BorderBrush="{StaticResource BorderBrush}"
|
<Grid.RowDefinitions>
|
||||||
BorderThickness="1"
|
<RowDefinition Height="Auto"/>
|
||||||
CornerRadius="15"
|
<RowDefinition Height="*"/>
|
||||||
Margin="10"
|
</Grid.RowDefinitions>
|
||||||
x:Name="MainBorder"
|
|
||||||
ClipToBounds="True"
|
|
||||||
MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
|
|
||||||
<Grid>
|
|
||||||
<controls:WinUI3CloseButton x:Name="BtnClose"
|
|
||||||
HorizontalAlignment="Right" VerticalAlignment="Top"
|
|
||||||
Width="46" Height="32"
|
|
||||||
Margin="0,0,0,0" Cursor="Hand" Click="BtnClose_Click"
|
|
||||||
Content="✕"/>
|
|
||||||
|
|
||||||
<!-- 主要内容区域 -->
|
<!-- 自定义标题栏 -->
|
||||||
|
<Border x:Name="Border_TitleBarRoot"
|
||||||
|
Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<ColumnDefinition/>
|
||||||
<RowDefinition Height="*"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<!-- 标题栏 -->
|
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}"
|
||||||
<Border Grid.Row="0"
|
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
|
||||||
Height="50"
|
|
||||||
Background="{StaticResource WindowBackground}"
|
|
||||||
CornerRadius="15,15,0,0"
|
|
||||||
Margin="0,0,46,0">
|
|
||||||
<Grid x:Name="TitleBar" VerticalAlignment="Stretch">
|
|
||||||
<StackPanel Orientation="Horizontal"
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Margin="22,0,0,0">
|
|
||||||
<!-- 设置图标 -->
|
|
||||||
<Path Data="M12 15.5A3.5 3.5 0 0 1 8.5 12A3.5 3.5 0 0 1 12 8.5A3.5 3.5 0 0 1 15.5 12A3.5 3.5 0 0 1 12 15.5M19.43 12.97C19.47 12.65 19.5 12.33 19.5 12C19.5 11.67 19.47 11.34 19.43 11.03L21.54 9.37C21.73 9.22 21.78 8.95 21.66 8.73L19.66 5.27C19.54 5.05 19.27 4.96 19.05 5.05L16.56 6.05C16.04 5.65 15.5 5.32 14.87 5.07L14.5 2.42C14.46 2.18 14.25 2 14 2H10C9.75 2 9.54 2.18 9.5 2.42L9.13 5.07C8.5 5.32 7.96 5.66 7.44 6.05L4.95 5.05C4.73 4.96 4.46 5.05 4.35 5.27L2.35 8.73C2.23 8.95 2.27 9.22 2.46 9.37L4.57 11.03C4.53 11.34 4.5 11.67 4.5 12C4.5 12.33 4.53 12.65 4.57 12.97L2.46 14.63C2.27 14.78 2.23 15.05 2.35 15.27L4.35 18.73C4.46 18.95 4.73 19.03 4.95 18.95L7.44 17.95C7.96 18.34 8.5 18.68 9.13 18.93L9.5 21.58C9.54 21.82 9.75 22 10 22H14C14.25 22 14.46 21.82 14.5 21.58L14.87 18.93C15.5 18.67 16.04 18.34 16.56 17.95L19.05 18.95C19.27 19.03 19.54 18.95 19.66 18.73L21.66 15.27C21.78 15.05 21.73 14.78 21.54 14.63L19.43 12.97Z"
|
|
||||||
Stroke="{StaticResource TitleForeground}"
|
|
||||||
StrokeThickness="1.5"
|
|
||||||
StrokeLineJoin="Round"
|
|
||||||
Fill="Transparent"
|
|
||||||
Width="24" Height="24"
|
|
||||||
Stretch="Uniform"
|
|
||||||
Margin="0,0,8,0"/>
|
|
||||||
<!-- 标题文字 -->
|
|
||||||
<TextBlock Text="云储存管理"
|
|
||||||
FontSize="28"
|
|
||||||
FontWeight="Bold"
|
|
||||||
Foreground="{StaticResource TitleForeground}"
|
|
||||||
x:Name="TitleText"/>
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
|
|
||||||
<!-- 主内容区 -->
|
<!--Right Inset-->
|
||||||
<Border Grid.Row="1"
|
<Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
|
||||||
Background="{StaticResource WindowBackground}"
|
Grid.Column="2"/>
|
||||||
Padding="20,10,20,20"
|
|
||||||
CornerRadius="0,0,15,15">
|
<!--Right Buttons-->
|
||||||
<TabControl Background="{StaticResource WindowBackground}" BorderThickness="0" SelectionChanged="TabControl_SelectionChanged">
|
<ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
|
||||||
|
Orientation="Horizontal" Grid.Column="1" Spacing="5">
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 主内容区 -->
|
||||||
|
<Border Grid.Row="1"
|
||||||
|
Background="{StaticResource WindowBackground}"
|
||||||
|
Padding="20,10,20,20">
|
||||||
|
<TabControl Background="{StaticResource WindowBackground}" BorderThickness="0" SelectionChanged="TabControl_SelectionChanged">
|
||||||
<!-- 样式 -->
|
<!-- 样式 -->
|
||||||
<TabControl.Resources>
|
<TabControl.Resources>
|
||||||
<Style TargetType="TabItem">
|
<Style TargetType="TabItem">
|
||||||
@@ -908,10 +887,8 @@
|
|||||||
</ikw:SimpleStackPanel>
|
</ikw:SimpleStackPanel>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
</TabControl>
|
</TabControl>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
</Window>
|
</Window>
|
||||||
|
|
||||||
|
|||||||
@@ -7,14 +7,17 @@
|
|||||||
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
||||||
xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
|
xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
ui:WindowHelper.UseModernWindowStyle="False"
|
|
||||||
ui:WindowHelper.SystemBackdropType="Mica"
|
|
||||||
Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize"
|
Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize"
|
||||||
WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow"
|
WindowStartupLocation="CenterScreen"
|
||||||
Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
|
Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
|
||||||
SnapsToDevicePixels="True"
|
SnapsToDevicePixels="True"
|
||||||
TextOptions.TextRenderingMode="ClearType"
|
TextOptions.TextRenderingMode="ClearType"
|
||||||
TextOptions.TextFormattingMode="Display">
|
TextOptions.TextFormattingMode="Display"
|
||||||
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
ui:WindowHelper.UseModernWindowStyle="True"
|
||||||
|
ui:TitleBar.Height="48">
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<!-- 主题相关颜色资源 -->
|
<!-- 主题相关颜色资源 -->
|
||||||
<SolidColorBrush x:Key="PrimaryBrush" Color="#FF2563eb"/>
|
<SolidColorBrush x:Key="PrimaryBrush" Color="#FF2563eb"/>
|
||||||
@@ -22,125 +25,157 @@
|
|||||||
<SolidColorBrush x:Key="TextSecondaryBrush" Color="#FF6b7280"/>
|
<SolidColorBrush x:Key="TextSecondaryBrush" Color="#FF6b7280"/>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
|
|
||||||
<Grid Background="Transparent" Margin="20">
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<!-- 标题区域 -->
|
<!-- 自定义标题栏 -->
|
||||||
<ikw:SimpleStackPanel Grid.Row="0" Orientation="Horizontal" Spacing="12" Margin="0,0,0,16">
|
<Border x:Name="Border_TitleBarRoot"
|
||||||
<Border Background="{DynamicResource PrimaryBrush}" CornerRadius="16" Padding="12" Margin="0,0,0,0">
|
Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
|
||||||
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Undo}" FontSize="20" Foreground="White"
|
|
||||||
VerticalAlignment="Center"/>
|
|
||||||
</Border>
|
|
||||||
<ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="4">
|
|
||||||
<TextBlock Text="选择要回滚到的历史版本" FontSize="22" FontWeight="Bold"
|
|
||||||
Foreground="{DynamicResource TextPrimaryBrush}"/>
|
|
||||||
</ikw:SimpleStackPanel>
|
|
||||||
</ikw:SimpleStackPanel>
|
|
||||||
|
|
||||||
<!-- 版本选择卡片 -->
|
|
||||||
<Border Grid.Row="1"
|
|
||||||
Background="{DynamicResource SettingsPageBackground}"
|
|
||||||
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
|
||||||
BorderThickness="1"
|
|
||||||
CornerRadius="12"
|
|
||||||
Margin="0,0,0,16"
|
|
||||||
Padding="20">
|
|
||||||
<Border.Effect>
|
|
||||||
<DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="0" Opacity="0.05"/>
|
|
||||||
</Border.Effect>
|
|
||||||
<ikw:SimpleStackPanel Spacing="16">
|
|
||||||
<TextBlock Text="选择版本" FontSize="16" FontWeight="SemiBold"
|
|
||||||
Foreground="{DynamicResource TextPrimaryBrush}"/>
|
|
||||||
<ComboBox x:Name="VersionComboBox"
|
|
||||||
Width="300" Height="40"
|
|
||||||
DisplayMemberPath="Version"
|
|
||||||
SelectionChanged="VersionComboBox_SelectionChanged"/>
|
|
||||||
</ikw:SimpleStackPanel>
|
|
||||||
</Border>
|
|
||||||
|
|
||||||
<!-- 发布说明卡片 -->
|
|
||||||
<Border Grid.Row="2"
|
|
||||||
Background="{DynamicResource SettingsPageBackground}"
|
|
||||||
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
|
||||||
BorderThickness="1"
|
|
||||||
CornerRadius="12"
|
|
||||||
Margin="0,0,0,16"
|
|
||||||
Padding="20">
|
|
||||||
<Border.Effect>
|
|
||||||
<DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="0" Opacity="0.05"/>
|
|
||||||
</Border.Effect>
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<RowDefinition Height="Auto"/>
|
<ColumnDefinition/>
|
||||||
<RowDefinition Height="*"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<TextBlock Grid.Row="0"
|
</Grid.ColumnDefinitions>
|
||||||
Text="版本更新说明" FontSize="16" FontWeight="SemiBold"
|
|
||||||
Foreground="{DynamicResource TextPrimaryBrush}"
|
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}"
|
||||||
Margin="0,0,0,16"/>
|
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
|
||||||
<Border Grid.Row="1"
|
|
||||||
Background="{DynamicResource SettingsPageBackground}"
|
<!--Right Inset-->
|
||||||
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
<Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
|
||||||
BorderThickness="1"
|
Grid.Column="2"/>
|
||||||
CornerRadius="8">
|
|
||||||
<Border.Effect>
|
<!--Right Buttons-->
|
||||||
<DropShadowEffect Color="#000000" BlurRadius="4" ShadowDepth="0" Opacity="0.03"/>
|
<ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
|
||||||
</Border.Effect>
|
Orientation="Horizontal" Grid.Column="1" Spacing="5">
|
||||||
<ScrollViewer x:Name="InnerReleaseNotesScrollViewer"
|
</ikw:SimpleStackPanel>
|
||||||
VerticalScrollBarVisibility="Auto"
|
|
||||||
HorizontalScrollBarVisibility="Disabled"
|
|
||||||
Padding="16"
|
|
||||||
PanningMode="VerticalOnly"
|
|
||||||
PanningRatio="1.0"
|
|
||||||
IsManipulationEnabled="True">
|
|
||||||
<mdxam:MarkdownScrollViewer x:Name="ReleaseNotesViewer"
|
|
||||||
Foreground="{DynamicResource TextPrimaryBrush}"
|
|
||||||
MarkdownStyleName="GithubLike"
|
|
||||||
IsHitTestVisible="False"
|
|
||||||
IsManipulationEnabled="False"/>
|
|
||||||
</ScrollViewer>
|
|
||||||
</Border>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<!-- 操作按钮区域 -->
|
<!-- 主内容区 -->
|
||||||
<ikw:SimpleStackPanel Grid.Row="3" Spacing="16" Margin="0,0,0,0">
|
<Grid Grid.Row="1" Background="{DynamicResource SettingsPageBackground}" Margin="20,20,20,20">
|
||||||
<Button x:Name="RollbackButton"
|
<Grid.RowDefinitions>
|
||||||
Content="回滚到此版本"
|
<RowDefinition Height="Auto"/>
|
||||||
HorizontalAlignment="Center"
|
<RowDefinition Height="Auto"/>
|
||||||
Click="RollbackButton_Click"
|
<RowDefinition Height="*"/>
|
||||||
Style="{DynamicResource AccentButtonStyle}"
|
<RowDefinition Height="Auto"/>
|
||||||
Width="200" Height="48"
|
</Grid.RowDefinitions>
|
||||||
FontSize="16" FontWeight="SemiBold"/>
|
|
||||||
|
|
||||||
<!-- 下载进度面板 -->
|
<!-- 标题区域 -->
|
||||||
<Border x:Name="DownloadProgressPanel"
|
<ikw:SimpleStackPanel Grid.Row="0" Orientation="Horizontal" Spacing="12" Margin="0,0,0,16">
|
||||||
|
<Border Background="{DynamicResource PrimaryBrush}" CornerRadius="16" Padding="12" Margin="0,0,0,0">
|
||||||
|
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Undo}" FontSize="20" Foreground="White"
|
||||||
|
VerticalAlignment="Center"/>
|
||||||
|
</Border>
|
||||||
|
<ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="4">
|
||||||
|
<TextBlock Text="选择要回滚到的历史版本" FontSize="22" FontWeight="Bold"
|
||||||
|
Foreground="{DynamicResource TextPrimaryBrush}"/>
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
|
||||||
|
<!-- 版本选择卡片 -->
|
||||||
|
<Border Grid.Row="1"
|
||||||
Background="{DynamicResource SettingsPageBackground}"
|
Background="{DynamicResource SettingsPageBackground}"
|
||||||
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="12"
|
CornerRadius="12"
|
||||||
Visibility="Collapsed"
|
Margin="0,0,0,16"
|
||||||
Margin="0,8,0,0"
|
Padding="20">
|
||||||
Padding="24">
|
|
||||||
<Border.Effect>
|
<Border.Effect>
|
||||||
<DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="0" Opacity="0.05"/>
|
<DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="0" Opacity="0.05"/>
|
||||||
</Border.Effect>
|
</Border.Effect>
|
||||||
<ikw:SimpleStackPanel Spacing="12">
|
<ikw:SimpleStackPanel Spacing="16">
|
||||||
<ProgressBar x:Name="DownloadProgressBar"
|
<TextBlock Text="选择版本" FontSize="16" FontWeight="SemiBold"
|
||||||
Width="300" Height="8"
|
Foreground="{DynamicResource TextPrimaryBrush}"/>
|
||||||
Minimum="0" Maximum="100" Value="0"/>
|
<ComboBox x:Name="VersionComboBox"
|
||||||
<TextBlock x:Name="DownloadProgressText"
|
Width="300" Height="40"
|
||||||
Text="正在下载..."
|
DisplayMemberPath="Version"
|
||||||
FontSize="14"
|
SelectionChanged="VersionComboBox_SelectionChanged"/>
|
||||||
Foreground="{DynamicResource TextPrimaryBrush}"
|
|
||||||
HorizontalAlignment="Center"/>
|
|
||||||
</ikw:SimpleStackPanel>
|
</ikw:SimpleStackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
</ikw:SimpleStackPanel>
|
|
||||||
|
<!-- 发布说明卡片 -->
|
||||||
|
<Border Grid.Row="2"
|
||||||
|
Background="{DynamicResource SettingsPageBackground}"
|
||||||
|
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
||||||
|
BorderThickness="1"
|
||||||
|
CornerRadius="12"
|
||||||
|
Margin="0,0,0,16"
|
||||||
|
Padding="20">
|
||||||
|
<Border.Effect>
|
||||||
|
<DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="0" Opacity="0.05"/>
|
||||||
|
</Border.Effect>
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="*"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<TextBlock Grid.Row="0"
|
||||||
|
Text="版本更新说明" FontSize="16" FontWeight="SemiBold"
|
||||||
|
Foreground="{DynamicResource TextPrimaryBrush}"
|
||||||
|
Margin="0,0,0,16"/>
|
||||||
|
<Border Grid.Row="1"
|
||||||
|
Background="{DynamicResource SettingsPageBackground}"
|
||||||
|
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
||||||
|
BorderThickness="1"
|
||||||
|
CornerRadius="8">
|
||||||
|
<Border.Effect>
|
||||||
|
<DropShadowEffect Color="#000000" BlurRadius="4" ShadowDepth="0" Opacity="0.03"/>
|
||||||
|
</Border.Effect>
|
||||||
|
<ScrollViewer x:Name="InnerReleaseNotesScrollViewer"
|
||||||
|
VerticalScrollBarVisibility="Auto"
|
||||||
|
HorizontalScrollBarVisibility="Disabled"
|
||||||
|
Padding="16"
|
||||||
|
PanningMode="VerticalOnly"
|
||||||
|
PanningRatio="1.0"
|
||||||
|
IsManipulationEnabled="True">
|
||||||
|
<mdxam:MarkdownScrollViewer x:Name="ReleaseNotesViewer"
|
||||||
|
Foreground="{DynamicResource TextPrimaryBrush}"
|
||||||
|
MarkdownStyleName="GithubLike"
|
||||||
|
IsHitTestVisible="False"
|
||||||
|
IsManipulationEnabled="False"/>
|
||||||
|
</ScrollViewer>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 操作按钮区域 -->
|
||||||
|
<ikw:SimpleStackPanel Grid.Row="3" Spacing="16" Margin="0,0,0,0">
|
||||||
|
<Button x:Name="RollbackButton"
|
||||||
|
Content="回滚到此版本"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
Click="RollbackButton_Click"
|
||||||
|
Style="{DynamicResource AccentButtonStyle}"
|
||||||
|
Width="200" Height="48"
|
||||||
|
FontSize="16" FontWeight="SemiBold"/>
|
||||||
|
|
||||||
|
<!-- 下载进度面板 -->
|
||||||
|
<Border x:Name="DownloadProgressPanel"
|
||||||
|
Background="{DynamicResource SettingsPageBackground}"
|
||||||
|
BorderBrush="{DynamicResource SettingsPageBorderBrush}"
|
||||||
|
BorderThickness="1"
|
||||||
|
CornerRadius="12"
|
||||||
|
Visibility="Collapsed"
|
||||||
|
Margin="0,8,0,0"
|
||||||
|
Padding="24">
|
||||||
|
<Border.Effect>
|
||||||
|
<DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="0" Opacity="0.05"/>
|
||||||
|
</Border.Effect>
|
||||||
|
<ikw:SimpleStackPanel Spacing="12">
|
||||||
|
<ProgressBar x:Name="DownloadProgressBar"
|
||||||
|
Width="300" Height="8"
|
||||||
|
Minimum="0" Maximum="100" Value="0"/>
|
||||||
|
<TextBlock x:Name="DownloadProgressText"
|
||||||
|
Text="正在下载..."
|
||||||
|
FontSize="14"
|
||||||
|
Foreground="{DynamicResource TextPrimaryBrush}"
|
||||||
|
HorizontalAlignment="Center"/>
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
</Border>
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -4,11 +4,18 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:Ink_Canvas"
|
xmlns:local="clr-namespace:Ink_Canvas"
|
||||||
mc:Ignorable="d" FontFamily="Microsoft YaHei UI" ui:WindowHelper.UseModernWindowStyle="True"
|
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
||||||
|
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
||||||
|
mc:Ignorable="d" FontFamily="Microsoft YaHei UI"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" Topmost="True"
|
Topmost="True"
|
||||||
Title="Ink Canvas 抽奖 - 名单导入" Height="500" Width="400"
|
Title="Ink Canvas 抽奖 - 名单导入" Height="500" Width="400"
|
||||||
Loaded="Window_Loaded" Closing="Window_Closing">
|
Loaded="Window_Loaded" Closing="Window_Closing"
|
||||||
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
ui:WindowHelper.UseModernWindowStyle="True"
|
||||||
|
ui:TitleBar.Height="48">
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<!-- 主题资源 -->
|
<!-- 主题资源 -->
|
||||||
<SolidColorBrush x:Key="NamesInputWindowBackground" Color="White"/>
|
<SolidColorBrush x:Key="NamesInputWindowBackground" Color="White"/>
|
||||||
@@ -17,28 +24,60 @@
|
|||||||
<SolidColorBrush x:Key="NamesInputWindowButtonForeground" Color="Black"/>
|
<SolidColorBrush x:Key="NamesInputWindowButtonForeground" Color="Black"/>
|
||||||
<SolidColorBrush x:Key="NamesInputWindowBorderBrush" Color="#E4E4E7"/>
|
<SolidColorBrush x:Key="NamesInputWindowBorderBrush" Color="#E4E4E7"/>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<Grid Background="{DynamicResource NamesInputWindowBackground}">
|
<Grid>
|
||||||
<Label Content="请在下方输入名单，每行一人（建议直接粘贴表格姓名列）"
|
<Grid.RowDefinitions>
|
||||||
Margin="10"
|
<RowDefinition Height="Auto"/>
|
||||||
Foreground="{DynamicResource NamesInputWindowForeground}"
|
<RowDefinition Height="*"/>
|
||||||
FontFamily="Microsoft YaHei UI"/>
|
</Grid.RowDefinitions>
|
||||||
<TextBox Name="TextBoxNames"
|
|
||||||
FontFamily="Microsoft YaHei UI"
|
<!-- 自定义标题栏 -->
|
||||||
VerticalScrollBarVisibility="Auto"
|
<Border x:Name="Border_TitleBarRoot"
|
||||||
AcceptsReturn="True"
|
Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
|
||||||
Margin="10,40,10,50"
|
<Grid>
|
||||||
Background="{DynamicResource NamesInputWindowBackground}"
|
<Grid.ColumnDefinitions>
|
||||||
Foreground="{DynamicResource NamesInputWindowForeground}"
|
<ColumnDefinition/>
|
||||||
BorderBrush="{DynamicResource NamesInputWindowBorderBrush}"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<Button Margin="10"
|
<ColumnDefinition Width="Auto"/>
|
||||||
VerticalAlignment="Bottom"
|
</Grid.ColumnDefinitions>
|
||||||
HorizontalAlignment="Right"
|
|
||||||
Content="关闭"
|
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}"
|
||||||
FontFamily="Microsoft YaHei UI"
|
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
|
||||||
Width="100"
|
|
||||||
Click="Button_Click"
|
<!--Right Inset-->
|
||||||
Background="{DynamicResource NamesInputWindowButtonBackground}"
|
<Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
|
||||||
Foreground="{DynamicResource NamesInputWindowButtonForeground}"
|
Grid.Column="2"/>
|
||||||
BorderBrush="{DynamicResource NamesInputWindowBorderBrush}"/>
|
|
||||||
|
<!--Right Buttons-->
|
||||||
|
<ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
|
||||||
|
Orientation="Horizontal" Grid.Column="1" Spacing="5">
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 主内容区 -->
|
||||||
|
<Grid Grid.Row="1" Background="{DynamicResource NamesInputWindowBackground}" Margin="10,10,10,10">
|
||||||
|
<Label Content="请在下方输入名单，每行一人（建议直接粘贴表格姓名列）"
|
||||||
|
Margin="10"
|
||||||
|
Foreground="{DynamicResource NamesInputWindowForeground}"
|
||||||
|
FontFamily="Microsoft YaHei UI"/>
|
||||||
|
<TextBox Name="TextBoxNames"
|
||||||
|
FontFamily="Microsoft YaHei UI"
|
||||||
|
VerticalScrollBarVisibility="Auto"
|
||||||
|
AcceptsReturn="True"
|
||||||
|
Margin="10,40,10,50"
|
||||||
|
Background="{DynamicResource NamesInputWindowBackground}"
|
||||||
|
Foreground="{DynamicResource NamesInputWindowForeground}"
|
||||||
|
BorderBrush="{DynamicResource NamesInputWindowBorderBrush}"/>
|
||||||
|
<Button Margin="10"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
Content="关闭"
|
||||||
|
FontFamily="Microsoft YaHei UI"
|
||||||
|
Width="100"
|
||||||
|
Click="Button_Click"
|
||||||
|
Background="{DynamicResource NamesInputWindowButtonBackground}"
|
||||||
|
Foreground="{DynamicResource NamesInputWindowButtonForeground}"
|
||||||
|
BorderBrush="{DynamicResource NamesInputWindowBorderBrush}"/>
|
||||||
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
+538
-499
File diff suppressed because it is too large
Load Diff
@@ -4,14 +4,17 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
||||||
|
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
||||||
xmlns:local="clr-namespace:Ink_Canvas.Windows"
|
xmlns:local="clr-namespace:Ink_Canvas.Windows"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
WindowStyle="None"
|
|
||||||
Title="插件管理" Height="550" Width="800"
|
Title="插件管理" Height="550" Width="800"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
ResizeMode="CanResize"
|
ResizeMode="CanResize"
|
||||||
AllowsTransparency="True"
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
Background="#F9F9F9">
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
ui:WindowHelper.UseModernWindowStyle="True"
|
||||||
|
ui:TitleBar.Height="48">
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<!-- 定义必要的资源 -->
|
<!-- 定义必要的资源 -->
|
||||||
@@ -28,22 +31,40 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<!-- 标题栏 -->
|
<!-- 自定义标题栏 -->
|
||||||
<Border Grid.Row="0" Background="{DynamicResource SystemAccentColorLight1}" Height="60"
|
<Border x:Name="Border_TitleBarRoot"
|
||||||
MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
|
Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
|
||||||
<Grid>
|
<Grid>
|
||||||
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
|
<Grid.ColumnDefinitions>
|
||||||
<TextBlock Text="插件管理" FontSize="22" FontWeight="SemiBold" Foreground="White" VerticalAlignment="Center"/>
|
<ColumnDefinition/>
|
||||||
</StackPanel>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<Button x:Name="BtnClose" Content="" FontFamily="Segoe MDL2 Assets"
|
<ColumnDefinition Width="Auto"/>
|
||||||
HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,20,0"
|
</Grid.ColumnDefinitions>
|
||||||
Background="Transparent" BorderThickness="0" FontSize="16" Foreground="White"
|
|
||||||
Click="BtnClose_Click"/>
|
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}"
|
||||||
|
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
|
||||||
|
|
||||||
|
<!--Right Inset-->
|
||||||
|
<Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
|
||||||
|
Grid.Column="2"/>
|
||||||
|
|
||||||
|
<!--Right Buttons-->
|
||||||
|
<ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
|
||||||
|
Orientation="Horizontal" Grid.Column="1" Spacing="5">
|
||||||
|
|
||||||
|
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
<!-- 内容区域背景 -->
|
||||||
|
<Border Grid.Row="1" Grid.RowSpan="2"
|
||||||
|
Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
|
||||||
|
BorderThickness="0,1,0,0"
|
||||||
|
BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
|
||||||
|
|
||||||
<!-- 主内容区 -->
|
<!-- 主内容区 -->
|
||||||
<Grid Grid.Row="1" Margin="20">
|
<Grid Grid.Row="1" Margin="20,20,20,20">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="250"/>
|
<ColumnDefinition Width="250"/>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
@@ -140,7 +161,7 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<!-- 底部操作栏 -->
|
<!-- 底部操作栏 -->
|
||||||
<Border Grid.Row="2" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}" Height="60">
|
<Border Grid.Row="2" Background="{DynamicResource SystemControlBackgroundAltHighBrush}" Height="60">
|
||||||
<Grid>
|
<Grid>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0,0,0">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0,0,0">
|
||||||
<Button x:Name="BtnLoadPlugin" Content="加载本地插件" Click="BtnLoadPlugin_Click"
|
<Button x:Name="BtnLoadPlugin" Content="加载本地插件" Click="BtnLoadPlugin_Click"
|
||||||
|
|||||||
@@ -519,6 +519,24 @@ namespace Ink_Canvas.Windows
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 刷新插件列表按钮点击事件
|
||||||
|
/// </summary>
|
||||||
|
private void Button_Refresh_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// 刷新插件列表
|
||||||
|
RefreshPluginList();
|
||||||
|
LogHelper.WriteLogToFile("用户点击刷新按钮，刷新插件列表");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
LogHelper.WriteLogToFile($"刷新插件列表时出错: {ex.Message}", LogHelper.LogType.Error);
|
||||||
|
MessageBox.Show($"刷新插件列表时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 保存插件状态按钮点击事件
|
/// 保存插件状态按钮点击事件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -616,38 +634,7 @@ namespace Ink_Canvas.Windows
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 关闭按钮点击事件
|
|
||||||
/// </summary>
|
|
||||||
private void BtnClose_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
// 直接关闭窗口，窗口关闭事件会处理配置保存
|
|
||||||
Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 标题栏拖拽事件
|
|
||||||
/// </summary>
|
|
||||||
private void TitleBar_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
|
|
||||||
{
|
|
||||||
if (e.ClickCount == 2)
|
|
||||||
{
|
|
||||||
// 双击标题栏切换最大化状态
|
|
||||||
if (WindowState == WindowState.Maximized)
|
|
||||||
{
|
|
||||||
WindowState = WindowState.Normal;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WindowState = WindowState.Maximized;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// 拖拽窗口
|
|
||||||
DragMove();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -4,10 +4,18 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:Ink_Canvas"
|
xmlns:local="clr-namespace:Ink_Canvas"
|
||||||
mc:Ignorable="d" FontFamily="Microsoft YaHei UI" ui:WindowHelper.UseModernWindowStyle="True"
|
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
||||||
|
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
||||||
|
mc:Ignorable="d"
|
||||||
|
FontFamily="Microsoft YaHei UI"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" Topmost="True"
|
Topmost="True"
|
||||||
Title="隐私说明 - Ink Canvas" Height="600" Width="600"
|
Title="隐私说明 - Ink Canvas" Height="600" Width="600"
|
||||||
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
ui:WindowHelper.UseModernWindowStyle="True"
|
||||||
|
ui:TitleBar.Height="48"
|
||||||
Loaded="Window_Loaded" Closing="Window_Closing">
|
Loaded="Window_Loaded" Closing="Window_Closing">
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<SolidColorBrush x:Key="PrivacyAgreementWindowBackground" Color="White"/>
|
<SolidColorBrush x:Key="PrivacyAgreementWindowBackground" Color="White"/>
|
||||||
@@ -18,82 +26,107 @@
|
|||||||
<SolidColorBrush x:Key="PrivacyAgreementWindowButtonAcceptBackground" Color="#3584e4"/>
|
<SolidColorBrush x:Key="PrivacyAgreementWindowButtonAcceptBackground" Color="#3584e4"/>
|
||||||
<SolidColorBrush x:Key="PrivacyAgreementWindowButtonAcceptForeground" Color="White"/>
|
<SolidColorBrush x:Key="PrivacyAgreementWindowButtonAcceptForeground" Color="White"/>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<Grid Background="{DynamicResource PrivacyAgreementWindowBackground}">
|
<Grid>
|
||||||
<Label Content="隐私说明"
|
<Grid.RowDefinitions>
|
||||||
Margin="10,10,10,0"
|
<RowDefinition Height="Auto"/>
|
||||||
VerticalAlignment="Top"
|
<RowDefinition Height="*"/>
|
||||||
Foreground="{DynamicResource PrivacyAgreementWindowForeground}"
|
</Grid.RowDefinitions>
|
||||||
FontFamily="Microsoft YaHei UI"
|
|
||||||
FontSize="18"
|
<!-- 自定义标题栏 -->
|
||||||
FontWeight="Bold"/>
|
<Border x:Name="Border_TitleBarRoot"
|
||||||
<ScrollViewer Margin="10,45,10,60"
|
Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
|
||||||
VerticalScrollBarVisibility="Auto"
|
<Grid>
|
||||||
HorizontalScrollBarVisibility="Disabled">
|
<Grid.ColumnDefinitions>
|
||||||
<TextBox Name="TextBoxPrivacyContent"
|
<ColumnDefinition/>
|
||||||
FontFamily="Microsoft YaHei UI"
|
<ColumnDefinition Width="Auto"/>
|
||||||
VerticalScrollBarVisibility="Auto"
|
<ColumnDefinition Width="Auto"/>
|
||||||
AcceptsReturn="True"
|
</Grid.ColumnDefinitions>
|
||||||
IsReadOnly="True"
|
|
||||||
TextWrapping="Wrap"
|
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}"
|
||||||
Background="{DynamicResource PrivacyAgreementWindowBackground}"
|
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
|
||||||
Foreground="{DynamicResource PrivacyAgreementWindowForeground}"
|
|
||||||
BorderBrush="{DynamicResource PrivacyAgreementWindowBorderBrush}"
|
<!--Right Inset-->
|
||||||
Padding="10"/>
|
<Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
|
||||||
</ScrollViewer>
|
Grid.Column="2"/>
|
||||||
<StackPanel Orientation="Horizontal"
|
|
||||||
HorizontalAlignment="Right"
|
<!--Right Buttons-->
|
||||||
VerticalAlignment="Bottom"
|
<ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
|
||||||
Margin="10">
|
Orientation="Horizontal" Grid.Column="1" Spacing="5">
|
||||||
<Button Name="ButtonCancel"
|
</ikw:SimpleStackPanel>
|
||||||
Margin="0,0,10,0"
|
</Grid>
|
||||||
Content="取消"
|
</Border>
|
||||||
FontFamily="Microsoft YaHei UI"
|
|
||||||
Width="100"
|
<!-- 主内容区 -->
|
||||||
Height="35"
|
<Grid Grid.Row="1" Background="{DynamicResource PrivacyAgreementWindowBackground}">
|
||||||
Click="ButtonCancel_Click"
|
<ScrollViewer Margin="10,10,10,70"
|
||||||
Background="{DynamicResource PrivacyAgreementWindowButtonBackground}"
|
VerticalScrollBarVisibility="Auto"
|
||||||
Foreground="{DynamicResource PrivacyAgreementWindowButtonForeground}"
|
HorizontalScrollBarVisibility="Disabled">
|
||||||
BorderBrush="{DynamicResource PrivacyAgreementWindowBorderBrush}"
|
<TextBox Name="TextBoxPrivacyContent"
|
||||||
OverridesDefaultStyle="True">
|
FontFamily="Microsoft YaHei UI"
|
||||||
<Button.Template>
|
VerticalScrollBarVisibility="Auto"
|
||||||
<ControlTemplate TargetType="Button">
|
AcceptsReturn="True"
|
||||||
<Border Background="{TemplateBinding Background}"
|
IsReadOnly="True"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
TextWrapping="Wrap"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
Background="{DynamicResource PrivacyAgreementWindowBackground}"
|
||||||
CornerRadius="4">
|
Foreground="{DynamicResource PrivacyAgreementWindowForeground}"
|
||||||
<ContentPresenter HorizontalAlignment="Center"
|
BorderBrush="{DynamicResource PrivacyAgreementWindowBorderBrush}"
|
||||||
VerticalAlignment="Center"
|
Padding="10"/>
|
||||||
Margin="{TemplateBinding Padding}"
|
</ScrollViewer>
|
||||||
RecognizesAccessKey="True"/>
|
<StackPanel Orientation="Horizontal"
|
||||||
</Border>
|
HorizontalAlignment="Right"
|
||||||
</ControlTemplate>
|
VerticalAlignment="Bottom"
|
||||||
</Button.Template>
|
Margin="10">
|
||||||
</Button>
|
<Button Name="ButtonCancel"
|
||||||
<Button Name="ButtonAccept"
|
Margin="0,0,10,0"
|
||||||
Content="同意"
|
Content="取消"
|
||||||
FontFamily="Microsoft YaHei UI"
|
FontFamily="Microsoft YaHei UI"
|
||||||
Width="100"
|
Width="100"
|
||||||
Height="35"
|
Height="35"
|
||||||
Click="ButtonAccept_Click"
|
Click="ButtonCancel_Click"
|
||||||
Background="{DynamicResource PrivacyAgreementWindowButtonAcceptBackground}"
|
Background="{DynamicResource PrivacyAgreementWindowButtonBackground}"
|
||||||
Foreground="{DynamicResource PrivacyAgreementWindowButtonAcceptForeground}"
|
Foreground="{DynamicResource PrivacyAgreementWindowButtonForeground}"
|
||||||
BorderBrush="{DynamicResource PrivacyAgreementWindowBorderBrush}"
|
BorderBrush="{DynamicResource PrivacyAgreementWindowBorderBrush}"
|
||||||
OverridesDefaultStyle="True">
|
OverridesDefaultStyle="True">
|
||||||
<Button.Template>
|
<Button.Template>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<Border Background="{TemplateBinding Background}"
|
<Border Background="{TemplateBinding Background}"
|
||||||
BorderBrush="{TemplateBinding BorderBrush}"
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
BorderThickness="{TemplateBinding BorderThickness}"
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<ContentPresenter HorizontalAlignment="Center"
|
<ContentPresenter HorizontalAlignment="Center"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Margin="{TemplateBinding Padding}"
|
Margin="{TemplateBinding Padding}"
|
||||||
RecognizesAccessKey="True"/>
|
RecognizesAccessKey="True"/>
|
||||||
</Border>
|
</Border>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Button.Template>
|
</Button.Template>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
<Button Name="ButtonAccept"
|
||||||
|
Content="同意"
|
||||||
|
FontFamily="Microsoft YaHei UI"
|
||||||
|
Width="100"
|
||||||
|
Height="35"
|
||||||
|
Click="ButtonAccept_Click"
|
||||||
|
Background="{DynamicResource PrivacyAgreementWindowButtonAcceptBackground}"
|
||||||
|
Foreground="{DynamicResource PrivacyAgreementWindowButtonAcceptForeground}"
|
||||||
|
BorderBrush="{DynamicResource PrivacyAgreementWindowBorderBrush}"
|
||||||
|
OverridesDefaultStyle="True">
|
||||||
|
<Button.Template>
|
||||||
|
<ControlTemplate TargetType="Button">
|
||||||
|
<Border Background="{TemplateBinding Background}"
|
||||||
|
BorderBrush="{TemplateBinding BorderBrush}"
|
||||||
|
BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
|
CornerRadius="4">
|
||||||
|
<ContentPresenter HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="{TemplateBinding Padding}"
|
||||||
|
RecognizesAccessKey="True"/>
|
||||||
|
</Border>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Button.Template>
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,18 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:local="clr-namespace:Ink_Canvas"
|
xmlns:local="clr-namespace:Ink_Canvas"
|
||||||
mc:Ignorable="d" FontFamily="Microsoft YaHei UI" ui:WindowHelper.UseModernWindowStyle="True"
|
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
||||||
|
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
||||||
|
mc:Ignorable="d" FontFamily="Microsoft YaHei UI"
|
||||||
WindowStartupLocation="CenterScreen"
|
WindowStartupLocation="CenterScreen"
|
||||||
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" Topmost="True"
|
Topmost="True"
|
||||||
Title="Ink Canvas 抽奖 - 点名历史记录" Height="500" Width="400"
|
Title="Ink Canvas 抽奖 - 点名历史记录" Height="500" Width="400"
|
||||||
Loaded="Window_Loaded">
|
Loaded="Window_Loaded"
|
||||||
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
ui:WindowHelper.UseModernWindowStyle="True"
|
||||||
|
ui:TitleBar.Height="48">
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<!-- 主题资源 -->
|
<!-- 主题资源 -->
|
||||||
<SolidColorBrush x:Key="RollCallHistoryWindowBackground" Color="White"/>
|
<SolidColorBrush x:Key="RollCallHistoryWindowBackground" Color="White"/>
|
||||||
@@ -17,30 +24,62 @@
|
|||||||
<SolidColorBrush x:Key="RollCallHistoryWindowButtonForeground" Color="Black"/>
|
<SolidColorBrush x:Key="RollCallHistoryWindowButtonForeground" Color="Black"/>
|
||||||
<SolidColorBrush x:Key="RollCallHistoryWindowBorderBrush" Color="#E4E4E7"/>
|
<SolidColorBrush x:Key="RollCallHistoryWindowBorderBrush" Color="#E4E4E7"/>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
<Grid Background="{DynamicResource RollCallHistoryWindowBackground}">
|
<Grid>
|
||||||
<Label Content="点名历史记录"
|
<Grid.RowDefinitions>
|
||||||
Margin="10"
|
<RowDefinition Height="Auto"/>
|
||||||
Foreground="{DynamicResource RollCallHistoryWindowForeground}"
|
<RowDefinition Height="*"/>
|
||||||
FontFamily="Microsoft YaHei UI"/>
|
</Grid.RowDefinitions>
|
||||||
<TextBox Name="TextBoxHistory"
|
|
||||||
FontFamily="Microsoft YaHei UI"
|
<!-- 自定义标题栏 -->
|
||||||
VerticalScrollBarVisibility="Auto"
|
<Border x:Name="Border_TitleBarRoot"
|
||||||
AcceptsReturn="True"
|
Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
|
||||||
IsReadOnly="True"
|
<Grid>
|
||||||
Margin="10,40,10,50"
|
<Grid.ColumnDefinitions>
|
||||||
Background="{DynamicResource RollCallHistoryWindowBackground}"
|
<ColumnDefinition/>
|
||||||
Foreground="{DynamicResource RollCallHistoryWindowForeground}"
|
<ColumnDefinition Width="Auto"/>
|
||||||
BorderBrush="{DynamicResource RollCallHistoryWindowBorderBrush}"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<Button Margin="10"
|
</Grid.ColumnDefinitions>
|
||||||
VerticalAlignment="Bottom"
|
|
||||||
HorizontalAlignment="Right"
|
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}"
|
||||||
Content="关闭"
|
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
|
||||||
FontFamily="Microsoft YaHei UI"
|
|
||||||
Width="100"
|
<!--Right Inset-->
|
||||||
Click="Button_Click"
|
<Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
|
||||||
Background="{DynamicResource RollCallHistoryWindowButtonBackground}"
|
Grid.Column="2"/>
|
||||||
Foreground="{DynamicResource RollCallHistoryWindowButtonForeground}"
|
|
||||||
BorderBrush="{DynamicResource RollCallHistoryWindowBorderBrush}"/>
|
<!--Right Buttons-->
|
||||||
|
<ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
|
||||||
|
Orientation="Horizontal" Grid.Column="1" Spacing="5">
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 主内容区 -->
|
||||||
|
<Grid Grid.Row="1" Background="{DynamicResource RollCallHistoryWindowBackground}" Margin="10,10,10,10">
|
||||||
|
<Label Content="点名历史记录"
|
||||||
|
Margin="10"
|
||||||
|
Foreground="{DynamicResource RollCallHistoryWindowForeground}"
|
||||||
|
FontFamily="Microsoft YaHei UI"/>
|
||||||
|
<TextBox Name="TextBoxHistory"
|
||||||
|
FontFamily="Microsoft YaHei UI"
|
||||||
|
VerticalScrollBarVisibility="Auto"
|
||||||
|
AcceptsReturn="True"
|
||||||
|
IsReadOnly="True"
|
||||||
|
Margin="10,40,10,50"
|
||||||
|
Background="{DynamicResource RollCallHistoryWindowBackground}"
|
||||||
|
Foreground="{DynamicResource RollCallHistoryWindowForeground}"
|
||||||
|
BorderBrush="{DynamicResource RollCallHistoryWindowBorderBrush}"/>
|
||||||
|
<Button Margin="10"
|
||||||
|
VerticalAlignment="Bottom"
|
||||||
|
HorizontalAlignment="Right"
|
||||||
|
Content="关闭"
|
||||||
|
FontFamily="Microsoft YaHei UI"
|
||||||
|
Width="100"
|
||||||
|
Click="Button_Click"
|
||||||
|
Background="{DynamicResource RollCallHistoryWindowButtonBackground}"
|
||||||
|
Foreground="{DynamicResource RollCallHistoryWindowButtonForeground}"
|
||||||
|
BorderBrush="{DynamicResource RollCallHistoryWindowBorderBrush}"/>
|
||||||
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|
||||||
|
|||||||
@@ -6,11 +6,46 @@
|
|||||||
xmlns:local="clr-namespace:Ink_Canvas"
|
xmlns:local="clr-namespace:Ink_Canvas"
|
||||||
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
|
||||||
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
|
||||||
mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen" ui:WindowHelper.UseModernWindowStyle="True"
|
mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen"
|
||||||
ResizeMode="NoResize" Closed="Window_Closed" ui:ThemeManager.RequestedTheme="Light"
|
ResizeMode="NoResize" Closed="Window_Closed"
|
||||||
Title="演示文档设置 - Ink Canvas For Class CE" Height="160" Width="450" FontFamily="Microsoft YaHei UI">
|
Title="演示文档设置 - Ink Canvas For Class CE" Height="160" Width="450" FontFamily="Microsoft YaHei UI"
|
||||||
|
ui:ThemeManager.IsThemeAware="True"
|
||||||
|
ui:TitleBar.ExtendViewIntoTitleBar="True"
|
||||||
|
ui:WindowHelper.SystemBackdropType="Mica"
|
||||||
|
ui:WindowHelper.UseModernWindowStyle="True"
|
||||||
|
ui:TitleBar.Height="48">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid Margin="10">
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="*"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<!-- 自定义标题栏 -->
|
||||||
|
<Border x:Name="Border_TitleBarRoot"
|
||||||
|
Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition/>
|
||||||
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}"
|
||||||
|
VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
|
||||||
|
|
||||||
|
<!--Right Inset-->
|
||||||
|
<Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
|
||||||
|
Grid.Column="2"/>
|
||||||
|
|
||||||
|
<!--Right Buttons-->
|
||||||
|
<ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
|
||||||
|
Orientation="Horizontal" Grid.Column="1" Spacing="5">
|
||||||
|
</ikw:SimpleStackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- 主内容区 -->
|
||||||
|
<Grid Grid.Row="1" Margin="10,10,10,10" Background="{DynamicResource SettingsPageBackground}">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
<RowDefinition Height="40"/>
|
<RowDefinition Height="40"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user