diff --git a/MainWindow.xaml b/MainWindow.xaml index 7711ace..8d2906f 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -11,7 +11,7 @@ WindowStyle="None" ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterScreen" - + MinHeight="400" MinWidth="800" StateChanged="MainWindow_OnStateChanged" @@ -29,13 +29,7 @@ - - - - - - - + diff --git a/Resource/Images/UIResource/08-bg.jpg b/Resource/Images/UIResource/08-bg.jpg new file mode 100644 index 0000000..f8e6953 Binary files /dev/null and b/Resource/Images/UIResource/08-bg.jpg differ diff --git a/SparkClient.csproj b/SparkClient.csproj index 3590ad4..4812044 100644 --- a/SparkClient.csproj +++ b/SparkClient.csproj @@ -123,6 +123,8 @@ + + diff --git a/ViewModel/Grading/DiamondSelectVM.cs b/ViewModel/Grading/DiamondSelectVM.cs index b096eef..c3aa83b 100644 --- a/ViewModel/Grading/DiamondSelectVM.cs +++ b/ViewModel/Grading/DiamondSelectVM.cs @@ -115,9 +115,9 @@ public class DiamondSelectVM : BaseViewModel /// public async void StartGrading(object param) { - // #if DEBUG - // DoStartGrading(param); - // #else + #if DEBUG + DoStartGrading(param); + #else LoadingDialog loading = new LoadingDialog(); try { @@ -217,7 +217,7 @@ public class DiamondSelectVM : BaseViewModel finally { } - // #endif + #endif } /// diff --git a/Views/Configuration/ConfigMenuPage.xaml b/Views/Configuration/ConfigMenuPage.xaml index d2d63c9..a004b18 100644 --- a/Views/Configuration/ConfigMenuPage.xaml +++ b/Views/Configuration/ConfigMenuPage.xaml @@ -6,11 +6,11 @@ xmlns:local="clr-namespace:SparkClient.Views" mc:Ignorable="d" > - - - + + + - + @@ -25,17 +25,8 @@ -