diff --git a/App.xaml.cs b/App.xaml.cs index 025a305..2d3b14c 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -71,7 +71,7 @@ namespace formula_manage private void Application_Startup(object sender, StartupEventArgs e) { Application.Current.StartupUri = new Uri("Login.xaml", UriKind.Relative);//和MainWindwo同一目录 - //Application.Current.StartupUri = new Uri("", UriKind.Relative);//在目录下 + //Application.Current.StartupUri = new Uri("EX/ExProgram.xaml", UriKind.Relative);//在目录下 } } diff --git a/EX/ExProgram.xaml b/EX/ExProgram.xaml new file mode 100644 index 0000000..6521b3b --- /dev/null +++ b/EX/ExProgram.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/EX/ExProgram.xaml.cs b/EX/ExProgram.xaml.cs new file mode 100644 index 0000000..4696f45 --- /dev/null +++ b/EX/ExProgram.xaml.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace formula_manage.EX +{ + /// + /// ExProgram.xaml 的交互逻辑 + /// + public partial class ExProgram : Window + { + public ExProgram() + { + InitializeComponent(); + } + } +} diff --git a/MainWindow.xaml b/MainWindow.xaml index 177da8f..6ca6f41 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -162,6 +162,8 @@ + + diff --git a/formula_manage.csproj b/formula_manage.csproj index c3ecc9a..dba70ef 100644 --- a/formula_manage.csproj +++ b/formula_manage.csproj @@ -160,6 +160,7 @@ + packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll @@ -210,6 +211,9 @@ + + ExProgram.xaml + Login.xaml @@ -276,6 +280,10 @@ Stuff.xaml + + Designer + MSBuild:Compile + Designer MSBuild:Compile