Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

新图标微调 #573

Merged
merged 16 commits into from
Apr 26, 2023
Merged

新图标微调 #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
78b9406
Add files via upload
WluhWluh Apr 20, 2023
6057911
图标微调
WluhWluh Apr 20, 2023
40e78d1
UI: 更新图标
Blinue Apr 20, 2023
18eabcb
UI: 优化关于界面 1
Blinue Apr 20, 2023
1a825be
docs: 更新 README
Blinue Apr 21, 2023
255e742
docs: 更新 README
Blinue Apr 21, 2023
3406bb0
docs: 更新 README
Blinue Apr 21, 2023
d0276cb
docs: 更新 README_EN
Blinue Apr 21, 2023
7248e2d
修复 ICO 导出错误
WluhWluh Apr 21, 2023
a2cc6c4
chore: 添加头图
Blinue Apr 23, 2023
70feb21
Merge branch 'main' into main
Blinue Apr 24, 2023
539915d
UI: 优化关于页面 2
Blinue Apr 26, 2023
6ec19c7
SVG 锚点精简
WluhWluh Apr 26, 2023
303f5d5
UI: 优化关于页面 3
Blinue Apr 26, 2023
a750ff7
UI: 本地化
Blinue Apr 26, 2023
d3cd35c
chore: 更新窗口截图
Blinue Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Magpie

[![许可协议](https://img.shields.io/github/license/Blinue/Magpie)](./LICENSE)
[![build](https://github.com/Blinue/Magpie/actions/workflows/build.yml/badge.svg)](https://github.com/Blinue/Magpie/actions/workflows/build.yml)
[![All Contributors](https://img.shields.io/github/all-contributors/Blinue/Magpie)](#%E8%B4%A1%E7%8C%AE%E8%80%85-)
[![GitHub all releases](https://img.shields.io/github/downloads/Blinue/Magpie/total)](https://github.com/Blinue/Magpie/releases)
<br>
<br>
<p align="center">
<img src="https://raw.githubusercontent.com/Blinue/Magpie/18eabcbdd6de2420ee5d749b43e6e5aa7b3d042e/src/Magpie/Icons/PNG/Magpie%20Icon%20Full%20Disabled/256.png" width="128px" height="128px" alt="Logo of Magpie">
</p>
<h1 align="center">Magpie</h1>
<p align="center">
<a href="./LICENSE">
<img alt="许可协议" src="https://img.shields.io/github/license/Blinue/Magpie">
</a>
<a href="https://github.com/Blinue/Magpie/actions/workflows/build.yml">
<img alt="build" src="https://github.com/Blinue/Magpie/actions/workflows/build.yml/badge.svg">
</a>
<a href="#%E8%B4%A1%E7%8C%AE%E8%80%85-">
<img alt="All Contributors" src="https://img.shields.io/github/all-contributors/Blinue/Magpie">
</a>
<a href="https://github.com/Blinue/Magpie/releases">
<img alt="GitHub all releases" src="https://img.shields.io/github/downloads/Blinue/Magpie/total">
</a>
</p>

🌍 **简体中文** | [English](./README_EN.md)

Expand Down
26 changes: 20 additions & 6 deletions README_EN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# MAGPIE

[![License](https://img.shields.io/github/license/Blinue/Magpie)](./LICENSE)
[![build](https://github.com/Blinue/Magpie/actions/workflows/build.yml/badge.svg)](https://github.com/Blinue/Magpie/actions/workflows/build.yml)
[![All Contributors](https://img.shields.io/github/all-contributors/Blinue/Magpie)](#%E8%B4%A1%E7%8C%AE%E8%80%85-)
[![GitHub all releases](https://img.shields.io/github/downloads/Blinue/Magpie/total)](https://github.com/Blinue/Magpie/releases)
<br>
<br>
<p align="center">
<img src="https://raw.githubusercontent.com/Blinue/Magpie/18eabcbdd6de2420ee5d749b43e6e5aa7b3d042e/src/Magpie/Icons/PNG/Magpie%20Icon%20Full%20Disabled/256.png" width="128px" height="128px" alt="Logo of Magpie">
</p>
<h1 align="center">Magpie</h1>
<p align="center">
<a href="./LICENSE">
<img alt="License" src="https://img.shields.io/github/license/Blinue/Magpie">
</a>
<a href="https://github.com/Blinue/Magpie/actions/workflows/build.yml">
<img alt="build" src="https://github.com/Blinue/Magpie/actions/workflows/build.yml/badge.svg">
</a>
<a href="#%E8%B4%A1%E7%8C%AE%E8%80%85-">
<img alt="All Contributors" src="https://img.shields.io/github/all-contributors/Blinue/Magpie">
</a>
<a href="https://github.com/Blinue/Magpie/releases">
<img alt="GitHub all releases" src="https://img.shields.io/github/downloads/Blinue/Magpie/total">
</a>
</p>

:earth_africa: [简体中文](./README.md) | **English**

Expand Down
42 changes: 42 additions & 0 deletions Settings.XamlStyler
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"AttributesTolerance": 1,
"KeepFirstAttributeOnSameLine": true,
"MaxAttributeCharactersPerLine": 0,
"MaxAttributesPerLine": 1,
"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
"SeparateByGroups": false,
"AttributeIndentation": 0,
"AttributeIndentationStyle": 1,
"RemoveDesignTimeReferences": false,
"IgnoreDesignTimeReferencePrefix": false,
"EnableAttributeReordering": true,
"AttributeOrderingRuleGroups": [
"x:Class",
"xmlns, xmlns:x",
"xmlns:*",
"x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
"Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
"Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
"Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
"*:*, *",
"PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
"mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
"Storyboard.*, From, To, Duration"
],
"FirstLineAttributes": "",
"OrderAttributesByName": true,
"PutEndingBracketOnNewLine": false,
"RemoveEndingTagOfEmptyElement": true,
"SpaceBeforeClosingSlash": true,
"RootElementLineBreakRule": 0,
"ReorderVSM": 2,
"ReorderGridChildren": false,
"ReorderCanvasChildren": false,
"ReorderSetters": 0,
"FormatMarkupExtension": true,
"NoNewLineMarkupExtensions": "x:Bind, Binding",
"ThicknessSeparator": 2,
"ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
"FormatOnSave": true,
"CommentPadding": 2,
}
Binary file modified img/Main window.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/Repo card.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/主窗口.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
237 changes: 124 additions & 113 deletions src/Magpie.App/AboutPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,124 +10,135 @@
<StackPanel HorizontalAlignment="Stretch"
ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
Orientation="Vertical">
<local:SettingsGroup x:Uid="About_Version"
Margin="0,-24,0,0">
<StackPanel Margin="0,10,0,0"
Orientation="Vertical">
<StackPanel Orientation="Horizontal"
Spacing="20">
<Image Width="64"
Height="64"
Source="{x:Bind ViewModel.Logo, Mode=OneWay}" />
<StackPanel Margin="0,-4,0,0"
VerticalAlignment="Center"
Orientation="Vertical"
Spacing="4">
<TextBlock FontSize="24"
Text="Magpie" />
<TextBlock FontSize="{StaticResource SecondaryTextFontSize}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Text="{x:Bind ViewModel.Version, Mode=OneTime}" />
</StackPanel>
</StackPanel>
<StackPanel>
<Button Margin="0,15,0,0"
Click="{x:Bind ViewModel.CheckForUpdates}"
IsEnabled="{x:Bind ViewModel.IsCheckForUpdatesButtonEnabled, Mode=OneWay}"
Style="{StaticResource AccentButtonStyle}">
<Grid>
<TextBlock x:Uid="About_Version_CheckForUpdates"
Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay, Converter={StaticResource NegativeVisibilityConverter}}" />
<StackPanel Orientation="Horizontal"
Spacing="8">
<muxc:ProgressRing Width="16"
Height="16"
VerticalAlignment="Center"
Foreground="White"
IsActive="True"
Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay}" />
<TextBlock x:Uid="About_Version_CheckingForUpdates"
VerticalAlignment="Center"
Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay}" />
</StackPanel>
</Grid>
</Button>
</StackPanel>
<StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
Orientation="Vertical">
<muxc:Expander HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Style="{StaticResource SettingExpanderStyle}">
<muxc:Expander.Header>
<local:SettingsCard Title="{x:Bind ViewModel.Version, Mode=OneTime}"
Style="{StaticResource ExpanderHeaderSettingStyle}">
<local:SettingsCard.Icon>
<FontIcon Glyph="&#xE895;" />
</local:SettingsCard.Icon>
<local:SettingsCard.Description>
<HyperlinkButton x:Uid="About_Version_ReleaseNotes"
NavigateUri="{x:Bind ViewModel.ReleaseNotesLink, Mode=OneTime}" />
</local:SettingsCard.Description>
<local:SettingsCard.ActionContent>
<StackPanel>
<Button x:Uid="About_Version_CheckForUpdates"
Click="{x:Bind ViewModel.CheckForUpdates}"
IsEnabled="{x:Bind ViewModel.IsDownloadingOrLater, Mode=OneWay, Converter={StaticResource NegationConverter}}"
Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay, Converter={StaticResource NegativeVisibilityConverter}}" />
<StackPanel Orientation="Horizontal"
Spacing="8"
Visibility="{x:Bind ViewModel.IsCheckingForUpdates, Mode=OneWay}">
<muxc:ProgressRing Width="20"
Height="20"
VerticalAlignment="Center"
IsActive="True" />
<TextBlock x:Uid="About_Version_CheckingForUpdates"
VerticalAlignment="Center" />
</StackPanel>
</StackPanel>
</local:SettingsCard.ActionContent>
</local:SettingsCard>
</muxc:Expander.Header>
<muxc:Expander.Content>
<StackPanel Orientation="Vertical">
<local:SettingsCard Style="{StaticResource ExpanderContentSettingStyle}">
<CheckBox x:Uid="About_Version_AutoCheckForUpdates"
IsChecked="{x:Bind ViewModel.IsAutoCheckForUpdates, Mode=TwoWay}" />
</local:SettingsCard>
<local:SettingsCard Style="{StaticResource ExpanderContentSettingStyle}">
<CheckBox x:Uid="About_Version_AutoCheckForPreviewUpdates"
IsChecked="{x:Bind ViewModel.IsCheckForPreviewUpdates, Mode=TwoWay}" />
</local:SettingsCard>
</StackPanel>
</muxc:Expander.Content>
</muxc:Expander>
<StackPanel>
<muxc:InfoBar x:Uid="About_Version_CheckForUpdatesFailed"
Margin="0,2,0,0"
IsOpen="{x:Bind ViewModel.IsErrorWhileChecking, Mode=TwoWay}"
Severity="Error"
Visibility="{x:Bind ViewModel.IsErrorWhileChecking, Mode=OneWay}" />
<muxc:InfoBar x:Uid="About_Version_UpdateToDate"
Margin="0,2,0,0"
IsOpen="{x:Bind ViewModel.IsNoUpdate, Mode=TwoWay}"
Severity="Success"
Visibility="{x:Bind ViewModel.IsNoUpdate, Mode=OneWay}" />
<muxc:InfoBar Title="{x:Bind ViewModel.UpdateCardTitle, Mode=OneWay}"
Margin="0,2,0,0"
IsClosable="{x:Bind ViewModel.IsUpdateCardClosable, Mode=OneWay}"
IsOpen="{x:Bind ViewModel.IsUpdateCardOpen, Mode=TwoWay}"
Severity="Informational"
Visibility="{x:Bind ViewModel.IsUpdateCardOpen, Mode=OneWay}">
<StackPanel>
<Grid Margin="0,0,25,16"
ColumnSpacing="12"
Visibility="{x:Bind ViewModel.IsDownloadingOrLater, Mode=OneWay}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<muxc:ProgressBar Grid.Column="0"
Margin="0"
Padding="0"
VerticalAlignment="Center"
IsIndeterminate="{x:Bind ViewModel.IsNoDownloadProgress, Mode=OneWay}"
Maximum="1"
Minimum="0"
ShowError="{x:Bind ViewModel.IsErrorWhileDownloading, Mode=OneWay}"
Value="{x:Bind ViewModel.DownloadProgress, Mode=OneWay}" />
<StackPanel Grid.Column="1"
Margin="0,-2,0,0"
VerticalAlignment="Center">
<TextBlock x:Uid="About_Version_UpdateToDate_Downloading"
Visibility="{x:Bind ViewModel.IsDownloading, Mode=OneWay}" />
<TextBlock x:Uid="About_Version_UpdateToDate_DownloadFailed"
Margin="0,0,-48,0"
Visibility="{x:Bind ViewModel.IsErrorWhileDownloading, Mode=OneWay}" />
<TextBlock x:Uid="About_Version_UpdateToDate_Installing"
Visibility="{x:Bind ViewModel.IsInstalling, Mode=OneWay}" />
</StackPanel>
</Grid>
<StackPanel Margin="0,0,0,16"
Orientation="Horizontal">
<Button x:Uid="About_Version_UpdateCard_DownloadAndInstall"
Click="{x:Bind ViewModel.DownloadAndInstall}"
Style="{StaticResource AccentButtonStyle}"
Visibility="{x:Bind ViewModel.IsAvailable, Mode=OneWay}" />
<Button x:Uid="About_Version_UpdateCard_Retry"
Click="{x:Bind ViewModel.Retry}"
Visibility="{x:Bind ViewModel.IsErrorWhileDownloading, Mode=OneWay}" />
<Button x:Uid="About_Version_UpdateCard_Cancel"
Click="{x:Bind ViewModel.Cancel}"
IsEnabled="{x:Bind ViewModel.IsDownloading, Mode=OneWay}"
Visibility="{x:Bind ViewModel.IsCancelButtonVisible, Mode=OneWay}" />
<HyperlinkButton x:Uid="About_Version_UpdateCard_ReleaseNotes"
Margin="8,0,0,0"
VerticalAlignment="Center"
NavigateUri="{x:Bind ViewModel.UpdateReleaseNotesLink, Mode=OneWay}" />
<muxc:InfoBar x:Uid="About_Version_CheckForUpdatesFailed"
Margin="0,10,0,0"
IsOpen="{x:Bind ViewModel.IsErrorWhileChecking, Mode=TwoWay}"
Severity="Error"
Visibility="{x:Bind ViewModel.IsErrorWhileChecking, Mode=OneWay}" />
<muxc:InfoBar x:Uid="About_Version_UpdateToDate"
Margin="0,10,0,0"
IsOpen="{x:Bind ViewModel.IsNoUpdate, Mode=TwoWay}"
Severity="Success"
Visibility="{x:Bind ViewModel.IsNoUpdate, Mode=OneWay}" />
<muxc:InfoBar Title="{x:Bind ViewModel.UpdateCardTitle, Mode=OneWay}"
Margin="0,10,0,0"
IsClosable="{x:Bind ViewModel.IsUpdateCardClosable, Mode=OneWay}"
IsOpen="{x:Bind ViewModel.IsUpdateCardOpen, Mode=TwoWay}"
Severity="Informational"
Visibility="{x:Bind ViewModel.IsUpdateCardOpen, Mode=OneWay}">
<StackPanel>
<Grid Margin="0,0,25,16"
ColumnSpacing="12"
Visibility="{x:Bind ViewModel.IsDownloadingOrLater, Mode=OneWay}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<muxc:ProgressBar Grid.Column="0"
Margin="0"
Padding="0"
VerticalAlignment="Center"
IsIndeterminate="{x:Bind ViewModel.IsNoDownloadProgress, Mode=OneWay}"
Maximum="1"
Minimum="0"
ShowError="{x:Bind ViewModel.IsErrorWhileDownloading, Mode=OneWay}"
Value="{x:Bind ViewModel.DownloadProgress, Mode=OneWay}" />
<StackPanel Grid.Column="1"
Margin="0,-2,0,0"
VerticalAlignment="Center">
<TextBlock x:Uid="About_Version_UpdateToDate_Downloading"
Visibility="{x:Bind ViewModel.IsDownloading, Mode=OneWay}" />
<TextBlock x:Uid="About_Version_UpdateToDate_DownloadFailed"
Margin="0,0,-48,0"
Visibility="{x:Bind ViewModel.IsErrorWhileDownloading, Mode=OneWay}" />
<TextBlock x:Uid="About_Version_UpdateToDate_Installing"
Visibility="{x:Bind ViewModel.IsInstalling, Mode=OneWay}" />
</StackPanel>
</Grid>
<StackPanel Margin="0,0,0,16"
Orientation="Horizontal">
<Button x:Uid="About_Version_UpdateCard_DownloadAndInstall"
Click="{x:Bind ViewModel.DownloadAndInstall}"
Style="{StaticResource AccentButtonStyle}"
Visibility="{x:Bind ViewModel.IsAvailable, Mode=OneWay}" />
<Button x:Uid="About_Version_UpdateCard_Retry"
Click="{x:Bind ViewModel.Retry}"
Visibility="{x:Bind ViewModel.IsErrorWhileDownloading, Mode=OneWay}" />
<Button x:Uid="About_Version_UpdateCard_Cancel"
Click="{x:Bind ViewModel.Cancel}"
IsEnabled="{x:Bind ViewModel.IsDownloading, Mode=OneWay}"
Visibility="{x:Bind ViewModel.IsCancelButtonVisible, Mode=OneWay}" />
<HyperlinkButton x:Uid="About_Version_UpdateCard_ReleaseNotes"
Margin="8,0,0,0"
VerticalAlignment="Center"
NavigateUri="{x:Bind ViewModel.UpdateReleaseNotesLink, Mode=OneWay}" />
</StackPanel>
</muxc:InfoBar>
</StackPanel>
</StackPanel>
</muxc:InfoBar>
</StackPanel>
</StackPanel>
<local:SettingsGroup x:Uid="About_Version_UpdateSettings">
<local:SettingsCard x:Uid="About_Version_UpdateSettings_AutoCheckForUpdates">
<local:SettingsCard.Icon>
<FontIcon Glyph="&#xECC5;" />
</local:SettingsCard.Icon>
<local:SettingsCard.ActionContent>
<ToggleSwitch x:Uid="ToggleSwitch"
IsOn="{x:Bind ViewModel.IsAutoCheckForUpdates, Mode=TwoWay}" />
</local:SettingsCard.ActionContent>
</local:SettingsCard>
<local:SettingsCard x:Uid="About_Version_UpdateSettings_CheckForPreviewUpdates">
<local:SettingsCard.Icon>
<FontIcon Glyph="&#xED56;" />
</local:SettingsCard.Icon>
<local:SettingsCard.ActionContent>
<ToggleSwitch x:Uid="ToggleSwitch"
IsOn="{x:Bind ViewModel.IsCheckForPreviewUpdates, Mode=TwoWay}" />
</local:SettingsCard.ActionContent>
</local:SettingsCard>
</local:SettingsGroup>
<local:SettingsGroup x:Uid="About_Feedback">
<Button MinHeight="60"
Expand Down
Loading