Remove Fluent Design

This commit is contained in:
the1812 2019-05-28 15:47:16 +08:00
parent c474c6c922
commit 397d865fa1
8 changed files with 30 additions and 110 deletions

View File

@ -3,14 +3,11 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:VideoLinkDownloader"
xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
StartupUri="MainWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!-- FluentWPF Controls -->
<ResourceDictionary
Source="pack://application:,,,/FluentWPF;component/Styles/Controls.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>

View File

@ -5,10 +5,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:VideoLinkDownloader"
xmlns:fw="clr-namespace:SourceChord.FluentWPF;assembly=FluentWPF"
mc:Ignorable="d"
Background="#222"
Foreground="White"
Background="White"
Foreground="Black"
Title="MainWindow"
Height="450"
Width="800">
@ -16,20 +15,16 @@
<WindowChrome
GlassFrameThickness="1"
ResizeBorderThickness="4"
CaptionHeight="0"
/>
CaptionHeight="0" />
</WindowChrome.WindowChrome>
<Grid
fw:PointerTracker.Enabled="True"
Background="#0000">
Background="#222">
<Button
x:Name="button"
Content="Button"
HorizontalAlignment="Left"
Margin="5"
Width="75"
Height="32"
Foreground="White"
Style="{StaticResource ButtonRevealStyle}" />
Height="32"/>
</Grid>
</Window>

View File

@ -21,8 +21,8 @@ namespace VideoLinkDownloader
public MainWindow()
{
InitializeComponent();
//button.Click += (s,e) =>
//{
button.Click += (s, e) =>
{
//AcrylicBlur.Apply(this, new Color
//{
// A = 0,
@ -30,14 +30,14 @@ namespace VideoLinkDownloader
// G = 255,
// B = 255,
//}, AccentState.Diabled);
// AcrylicBlur.Apply(this, new Color
// {
// A = 0,
// R = 255,
// G = 255,
// B = 255,
// }, AccentState.AcrylicBlurBehind);
//};
AcrylicBlur.Apply(this, new Color
{
A = 0,
R = 255,
G = 255,
B = 255,
}, AccentState.AcrylicBlurBehind);
};
}
}
}

View File

@ -1,23 +0,0 @@
<Window
x:Class="VideoLinkDownloader.TestWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:VideoLinkDownloader"
mc:Ignorable="d"
Title="TestWindow"
Background="Transparent"
Height="450"
Width="800">
<WindowChrome.WindowChrome>
<WindowChrome
CaptionHeight="0"
GlassFrameThickness="1"
ResizeBorderThickness="4"
UseAeroCaptionButtons="False" />
</WindowChrome.WindowChrome>
<Grid>
</Grid>
</Window>

View File

@ -1,34 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace VideoLinkDownloader
{
/// <summary>
/// TestWindow.xaml 的交互逻辑
/// </summary>
public partial class TestWindow : Window
{
public TestWindow()
{
InitializeComponent();
Loaded += (s, e) => AcrylicBlur.Apply(this, new Color
{
A = 1,
R = 255,
G = 255,
B = 255,
});
}
}
}

View File

@ -41,9 +41,6 @@
<ApplicationIcon>Bilibili-Evolved.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="FluentWPF, Version=0.6.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FluentWPF.0.6.1\lib\net45\FluentWPF.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
@ -64,9 +61,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="TestWindow.xaml.cs">
<DependentUpon>TestWindow.xaml</DependentUpon>
</Compile>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@ -84,10 +78,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="TestWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Pages\MainPage.xaml.cs">
@ -110,7 +100,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentWPF" version="0.6.1" targetFramework="net472" />
</packages>

View File

@ -108,13 +108,13 @@ export const map = new Map([
[`单机`, `Console`],
[`电台`, `Radio`],
[`绘画`, `Drawing`],
[`热门话题`, `Hot #Tags#`],
[`热门话题`, `Trending #Tags#`],
[`热门排行`, `Hot ranking`],
[`我关注的话题`, `Following #Tags#`],
[`前往TA的直播间`, `Open live room`],
[`今天你想了解什么呢?(☆▽☆)`, `Search ~~~ (☆▽☆)`],
[`请输入弹幕 DA☆ZE`, `Enter your danmaku DA☆ZE`],
[`有什么想和大家分享的?`, `Share your fancy!`],
[`有什么想和大家分享的?`, `What's happening?`],
[`有新动态,点击查看`, `New activities, click to view`],
[`以上为热门评论,`, `Aboves are hot comments`],
[`请自觉遵守互联网相关的政策法规,严禁发布色情、暴力、反动的言论。`, `Post your comments ε=ε=(ノ≧∇≦)`],