Skip to content

Commit

Permalink
Merge pull request #31 from Planshit/dev
Browse files Browse the repository at this point in the history 
更新1.1.8
  • Loading branch information
@noberumotto
noberumotto authored Mar 31, 2020
2 parents 3971dd1 + 42cba83 commit 8a2a3b9
Show file tree
Hide file tree
Showing 6 changed files with 169 additions and 151 deletions.
Binary file added screenshot/1.1.8/option.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions src/ProjectEye/Core/Service/SystemResourcesService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ public void Init()
ThemeName = "Dark",
ThemeColor = "Black"
});
Themes.Add(new ThemeModel()
{
DisplayName = "黑色（Black）",
ThemeName = "Black",
ThemeColor = "#000"
});
//Themes.Add(new ThemeModel()
//{
// DisplayName = "黑色（Black）",
// ThemeName = "Black",
// ThemeColor = "#000"
//});
Themes.Add(new ThemeModel()
{
DisplayName = "蓝色",
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectEye/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.0.0.1")]
102 changes: 54 additions & 48 deletions src/ProjectEye/Resources/Themes/Classic/Window.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,64 +41,67 @@
Background="{TemplateBinding Background}"
>
<AdornerDecorator>
<Grid x:Name="WindowContent">
<Grid>
<!--拓展内容-->
<ContentControl Content="{TemplateBinding ExtElement}" Panel.ZIndex="999"/>
<Grid x:Name="WindowContent">

<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="*"></RowDefinition>

</Grid.RowDefinitions>
</Grid.RowDefinitions>

<!--标题栏-->
<Grid
<!--标题栏-->
<Grid
x:Name="TitleBar"
Height="{DynamicResource WindowTitleBarHeight}">
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0" Opacity="0.1">
<GradientStop Color="{DynamicResource ThemeColor}" Offset="0"/>
<GradientStop Color="Transparent" Offset="1"/>
</LinearGradientBrush>
</Grid.Background>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0" Opacity="0.1">
<GradientStop Color="{DynamicResource ThemeColor}" Offset="0"/>
<GradientStop Color="Transparent" Offset="1"/>
</LinearGradientBrush>
</Grid.Background>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>

<ColumnDefinition Width="*"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>

</Grid.ColumnDefinitions>
<Grid Grid.Column="0" WindowChrome.IsHitTestVisibleInChrome="True">
<!--LOGO区域-->
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" WindowChrome.IsHitTestVisibleInChrome="True">
<!--LOGO区域-->


<Image Width="16" Height="16" Source="{TemplateBinding Icon}"
<Image Width="16" Height="16" Source="{TemplateBinding Icon}"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="7,0"/>
</Grid>
<!--导航栏区域-->
<Grid
</Grid>
<!--导航栏区域-->
<Grid
x:Name="NavigationViewGrid"
Grid.Column="1" WindowChrome.IsHitTestVisibleInChrome="True"
Panel.ZIndex="3">
<ContentControl
<ContentControl
x:Name="NavigationView"
VerticalAlignment="Center" HorizontalAlignment="Center" Content="{TemplateBinding NavigationView}" />
</Grid>
<Grid Grid.Column="2"
</Grid>
<Grid Grid.Column="2"
Panel.ZIndex="3">
<!--标题区域-->
<TextBlock Text="{TemplateBinding Title}" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<!--标题区域-->
<TextBlock Text="{TemplateBinding Title}" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center"/>

</Grid>
<Grid Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Top"
</Grid>
<Grid Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Top"
WindowChrome.IsHitTestVisibleInChrome="True"
Panel.ZIndex="3">
<!--系统按钮区域-->
<!--系统按钮区域-->

<StackPanel Orientation="Horizontal">
<!--最小化-->
<Button
<StackPanel Orientation="Horizontal">
<!--最小化-->
<Button
ToolTip="最小化"
Width="34"
Height="26"
Expand All @@ -107,8 +110,8 @@
Command="{x:Static cmd:Project1UIWindowCommands.MinimizeWindowCommand}"
Visibility="{TemplateBinding MinimizeVisibility}"
/>
<!--最大化-->
<Button
<!--最大化-->
<Button
ToolTip="最大化"
x:Name="MaximizeButton"
Width="34"
Expand All @@ -117,8 +120,8 @@
Content="&#xE922;"
Command="{x:Static cmd:Project1UIWindowCommands.MaximizeWindowCommand}"
Visibility="{TemplateBinding MaximizeVisibility}"/>
<!--还原-->
<Button
<!--还原-->
<Button
ToolTip="向下还原"
x:Name="RestoreButton"
Width="34"
Expand All @@ -127,8 +130,8 @@
Content="&#xE923;"
Visibility="Collapsed"
Command="{x:Static cmd:Project1UIWindowCommands.RestoreWindowCommand}"/>
<!--关闭-->
<Button
<!--关闭-->
<Button
ToolTip="关闭"
Width="34"
Height="26"
Expand All @@ -137,18 +140,19 @@
Command="{x:Static cmd:Project1UIWindowCommands.CloseWindowCommand}"
Visibility="{TemplateBinding CloseVisibility}"/>

</StackPanel>
</StackPanel>


</Grid>
</Grid>
</Grid>



<!--窗体内容-->
<ContentPresenter Grid.Row="1"
<!--窗体内容-->
<ContentPresenter Grid.Row="1"
Panel.ZIndex="2"/>

</Grid>
</Grid>
</AdornerDecorator>
</Border>
Expand All @@ -174,7 +178,9 @@
<Setter TargetName="RestoreButton" Property="Visibility" Value="Collapsed" />
</Trigger>-->
<!--<EventTrigger RoutedEvent="Window.Loaded">
--><!--窗口载入动画--><!--
-->
<!--窗口载入动画-->
<!--
<BeginStoryboard Storyboard="{StaticResource Storyboardload}">
</BeginStoryboard>
Expand All @@ -190,7 +196,7 @@
</ControlTemplate>
</Setter.Value>
</Setter>

</Style>


Expand Down
Loading

0 comments on commit 8a2a3b9

Please sign in to comment.