master
tongg 7 months ago
parent e9c43b9e77
commit 60187e63fd
  1. 10
      MainWindow.xaml
  2. BIN
      Resource/Images/UIResource/08-bg.jpg
  3. 2
      SparkClient.csproj
  4. 8
      ViewModel/Grading/DiamondSelectVM.cs
  5. 21
      Views/Configuration/ConfigMenuPage.xaml

@ -11,7 +11,7 @@
WindowStyle="None" WindowStyle="None"
ResizeMode="CanResizeWithGrip" ResizeMode="CanResizeWithGrip"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
MinHeight="400" MinHeight="400"
MinWidth="800" MinWidth="800"
StateChanged="MainWindow_OnStateChanged" StateChanged="MainWindow_OnStateChanged"
@ -29,13 +29,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- 窗口主体内容 --> <!-- 窗口主体内容 -->
<Border Grid.Row="0" > <Border Grid.Row="0" Background="#657aa9">
<Border.Background>
<!-- <ImageBrush ImageSource="pack://application:,,,/Resource/Images/homebg.png" Stretch="UniformToFill" /> -->
<LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
<GradientStop Color="#657aa9" Offset="0" />
</LinearGradientBrush>
</Border.Background>
<ContentControl DataContextChanged="FrameworkElement_OnDataContextChanged" ClipToBounds="True" Content="{Binding Content}"/> <ContentControl DataContextChanged="FrameworkElement_OnDataContextChanged" ClipToBounds="True" Content="{Binding Content}"/>
</Border> </Border>

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 KiB

@ -123,6 +123,8 @@
<Resource Include="Resource\Images\UIResource\01-8-1.png" /> <Resource Include="Resource\Images\UIResource\01-8-1.png" />
<None Remove="Resource\Images\UIResource\01-bg.jpg" /> <None Remove="Resource\Images\UIResource\01-bg.jpg" />
<Resource Include="Resource\Images\UIResource\01-bg.jpg" /> <Resource Include="Resource\Images\UIResource\01-bg.jpg" />
<None Remove="Resource\Images\UIResource\08-bg.jpg" />
<Resource Include="Resource\Images\UIResource\08-bg.jpg" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

@ -115,9 +115,9 @@ public class DiamondSelectVM : BaseViewModel
/// <param name="param"></param> /// <param name="param"></param>
public async void StartGrading(object param) public async void StartGrading(object param)
{ {
// #if DEBUG #if DEBUG
// DoStartGrading(param); DoStartGrading(param);
// #else #else
LoadingDialog loading = new LoadingDialog(); LoadingDialog loading = new LoadingDialog();
try try
{ {
@ -217,7 +217,7 @@ public class DiamondSelectVM : BaseViewModel
finally { finally {
} }
// #endif #endif
} }
/// <summary> /// <summary>

@ -6,11 +6,11 @@
xmlns:local="clr-namespace:SparkClient.Views" xmlns:local="clr-namespace:SparkClient.Views"
mc:Ignorable="d" > mc:Ignorable="d" >
<Grid> <Grid>
<!-- <Grid.Background> --> <Grid.Background>
<!-- <ImageBrush ImageSource="pack://application:,,,/Resource/Images/homebg.png" Stretch="UniformToFill" /> --> <ImageBrush ImageSource="pack://application:,,,/Resource/Images/UIResource/08-bg.jpg" Stretch="UniformToFill" />
<!-- </Grid.Background> --> </Grid.Background>
<Border Width="1000" Height="400" BorderBrush="Silver" BorderThickness="1" CornerRadius="20"> <Border Width="1000" Height="400" BorderBrush="Transparent" BorderThickness="1" CornerRadius="20">
<!-- <Border.Background> --> <!-- <Border.Background> -->
<!-- <RadialGradientBrush GradientOrigin="0.5,0.5" Center="0.5,0.5" RadiusX="0.5" RadiusY="0.5"> --> <!-- <RadialGradientBrush GradientOrigin="0.5,0.5" Center="0.5,0.5" RadiusX="0.5" RadiusY="0.5"> -->
<!-- ~1~ 内部颜色 @1@ --> <!-- ~1~ 内部颜色 @1@ -->
@ -25,17 +25,8 @@
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Right" Command="{Binding CloseCommand}"> <Button Grid.Row="0" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Right" Padding="0" Margin="0 5 10 0 " Command="{Binding CloseCommand}">
<Viewbox Stretch="Uniform"> <Image Source="../../Resource/Images/UIResource/01-8.png" x:Name="ImageClosed" Width="25" Height="40"/>
<Path Data="{StaticResource CloseGeometry}"
Fill="Azure"
Stroke="Azure"
StrokeThickness="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Margin="20 0 0 0"
Width="30" />
</Viewbox>
</Button> </Button>

Loading…
Cancel
Save