diff --git a/Plane.FormationCreator/Views/ConnectWindow.xaml b/Plane.FormationCreator/Views/ConnectWindow.xaml index e63f0da..1c4f62e 100644 --- a/Plane.FormationCreator/Views/ConnectWindow.xaml +++ b/Plane.FormationCreator/Views/ConnectWindow.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d" Title="" Width="500" - Height="300" + Height="325.107" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei" @@ -28,6 +28,7 @@ + @@ -84,8 +85,8 @@ - - + + diff --git a/Plane.FormationCreator/Views/ConnectWindow.xaml.cs b/Plane.FormationCreator/Views/ConnectWindow.xaml.cs index 605cac5..ee12e68 100644 --- a/Plane.FormationCreator/Views/ConnectWindow.xaml.cs +++ b/Plane.FormationCreator/Views/ConnectWindow.xaml.cs @@ -49,7 +49,7 @@ namespace Plane.FormationCreator.Views var version = Assembly.GetExecutingAssembly().GetName().Version; about_ver.Text = "版本:" + version.ToString(); - about_buildtm .Text= "编译时间:" + System.IO.File.GetLastWriteTime(this.GetType().Assembly.Location).ToString() ; + about_buildtm .Text= "编译时间:" + System.IO.File.GetLastWriteTime(this.GetType().Assembly.Location).ToString(); diff --git a/Plane.FormationCreator/Views/LoginView.xaml b/Plane.FormationCreator/Views/LoginView.xaml index 3966c63..63b027c 100644 --- a/Plane.FormationCreator/Views/LoginView.xaml +++ b/Plane.FormationCreator/Views/LoginView.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ignore="http://www.galasoft.ch/ignore" xmlns:Helper="clr-namespace:Plane.Util" - mc:Ignorable="d ignore" Height="253.421" Width="463.894" Title="登录系统" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" + mc:Ignorable="d ignore" Height="253.421" Width="463.894" Title="飞行魔方地面控制中心" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" > @@ -13,6 +13,7 @@ + @@ -31,7 +32,7 @@ - + - + + diff --git a/Plane.FormationCreator/Views/LoginView.xaml.cs b/Plane.FormationCreator/Views/LoginView.xaml.cs index 4b2e2fc..49d6c72 100644 --- a/Plane.FormationCreator/Views/LoginView.xaml.cs +++ b/Plane.FormationCreator/Views/LoginView.xaml.cs @@ -1,5 +1,6 @@ using Microsoft.Practices.ServiceLocation; using Plane.FormationCreator.ViewModels; +using System.Reflection; using System.Windows; using System.Windows.Controls; @@ -18,6 +19,9 @@ namespace Plane.FormationCreator.Views InitializeComponent(); LoginViewModel loginViewModel = ServiceLocator.Current.GetInstance(); this.DataContext = loginViewModel; + var version = Assembly.GetExecutingAssembly().GetName().Version; + about_ver.Content = "版本:" + version.ToString(); + } }