diff --git a/wpf_ax_utility/App.xaml.cs b/wpf_ax_utility/App.xaml.cs index b263966..fba39cd 100644 --- a/wpf_ax_utility/App.xaml.cs +++ b/wpf_ax_utility/App.xaml.cs @@ -6,6 +6,7 @@ using Serilog; using Serilog.Sinks.Graylog; using DevExpress.Mvvm; using DevExpress.Xpf.Core; +using System.Threading; namespace wpf_ax_utility { @@ -70,6 +71,8 @@ namespace wpf_ax_utility uriString = "/wpf_ax_utility;component/AppMainWindow.xaml"; } + Thread.Sleep(2000); + this.StartupUri = new Uri(uriString, UriKind.Relative); } } diff --git a/wpf_ax_utility/AxUtilitySplashScreen.xaml b/wpf_ax_utility/AxUtilitySplashScreen.xaml index a0bcea4..f226b5d 100644 --- a/wpf_ax_utility/AxUtilitySplashScreen.xaml +++ b/wpf_ax_utility/AxUtilitySplashScreen.xaml @@ -6,28 +6,42 @@ xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxt="http://schemas.devexpress.com/winfx/2008/xaml/core/themekeys" xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm" - MinWidth="600" - MinHeight="400" - AllowAcrylic="True" - dx:DXDesignTimeHelper.Background="#02188f" + MinWidth="550" + MinHeight="300" + ResizeMode="NoResize" + WindowStyle="None" + WindowStartupLocation="CenterScreen" + AllowsTransparency="True" + Background="Transparent" + Title="PAL Ax Utility" mc:Ignorable="d" d:DataContext="{x:Static dxmvvm:DXSplashScreenViewModel.DesignTimeData}"> + - - - - - + + + + + + + + - - - - - - + + + + + + + + + + + - - + + + diff --git a/wpf_ax_utility/res/axlogo.png b/wpf_ax_utility/res/axlogo.png new file mode 100644 index 0000000..861f302 Binary files /dev/null and b/wpf_ax_utility/res/axlogo.png differ diff --git a/wpf_ax_utility/res/pallogo.png b/wpf_ax_utility/res/pallogo.png index a1ad16b..03f72ba 100644 Binary files a/wpf_ax_utility/res/pallogo.png and b/wpf_ax_utility/res/pallogo.png differ diff --git a/wpf_ax_utility/wpf_ax_utility.csproj b/wpf_ax_utility/wpf_ax_utility.csproj index ea9e5ca..d20dba7 100644 --- a/wpf_ax_utility/wpf_ax_utility.csproj +++ b/wpf_ax_utility/wpf_ax_utility.csproj @@ -12,6 +12,7 @@ + @@ -19,6 +20,9 @@ Always + + Always + Always