diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dc3feab..52bfd97 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dc3feab..52bfd97 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 447b314..7d84139 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="/Views/MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dc3feab..52bfd97 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 447b314..7d84139 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="/Views/MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 0c365c7..5f0ffdd 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -10,6 +10,7 @@ using Newtonsoft.Json; using SubCabinetSolution.Model; using SubCabinetSolution.Views; +using MessageBox = HandyControl.Controls.MessageBox; namespace SubCabinetSolution.ViewModel { diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dc3feab..52bfd97 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 447b314..7d84139 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="/Views/MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 0c365c7..5f0ffdd 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -10,6 +10,7 @@ using Newtonsoft.Json; using SubCabinetSolution.Model; using SubCabinetSolution.Views; +using MessageBox = HandyControl.Controls.MessageBox; namespace SubCabinetSolution.ViewModel { diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs index fbcd7af..9566d22 100644 --- a/SubCabinetSolution/ViewModel/MainViewModel.cs +++ b/SubCabinetSolution/ViewModel/MainViewModel.cs @@ -16,6 +16,7 @@ using SubCabinetSolution.Utils; using SubCabinetSolution.Views; using ViewFaceCore.Core; +using MessageBox = HandyControl.Controls.MessageBox; using Point = System.Drawing.Point; using Size = System.Drawing.Size; diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dc3feab..52bfd97 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 447b314..7d84139 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="/Views/MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 0c365c7..5f0ffdd 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -10,6 +10,7 @@ using Newtonsoft.Json; using SubCabinetSolution.Model; using SubCabinetSolution.Views; +using MessageBox = HandyControl.Controls.MessageBox; namespace SubCabinetSolution.ViewModel { diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs index fbcd7af..9566d22 100644 --- a/SubCabinetSolution/ViewModel/MainViewModel.cs +++ b/SubCabinetSolution/ViewModel/MainViewModel.cs @@ -16,6 +16,7 @@ using SubCabinetSolution.Utils; using SubCabinetSolution.Views; using ViewFaceCore.Core; +using MessageBox = HandyControl.Controls.MessageBox; using Point = System.Drawing.Point; using Size = System.Drawing.Size; diff --git a/SubCabinetSolution/Views/EditUserDialog.xaml b/SubCabinetSolution/Views/EditUserDialog.xaml index 7758cbc..6072683 100644 --- a/SubCabinetSolution/Views/EditUserDialog.xaml +++ b/SubCabinetSolution/Views/EditUserDialog.xaml @@ -25,7 +25,7 @@ + SelectedIndex="0"> diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index dc3feab..52bfd97 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 447b314..7d84139 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="/Views/MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 0c365c7..5f0ffdd 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -10,6 +10,7 @@ using Newtonsoft.Json; using SubCabinetSolution.Model; using SubCabinetSolution.Views; +using MessageBox = HandyControl.Controls.MessageBox; namespace SubCabinetSolution.ViewModel { diff --git a/SubCabinetSolution/ViewModel/MainViewModel.cs b/SubCabinetSolution/ViewModel/MainViewModel.cs index fbcd7af..9566d22 100644 --- a/SubCabinetSolution/ViewModel/MainViewModel.cs +++ b/SubCabinetSolution/ViewModel/MainViewModel.cs @@ -16,6 +16,7 @@ using SubCabinetSolution.Utils; using SubCabinetSolution.Views; using ViewFaceCore.Core; +using MessageBox = HandyControl.Controls.MessageBox; using Point = System.Drawing.Point; using Size = System.Drawing.Size; diff --git a/SubCabinetSolution/Views/EditUserDialog.xaml b/SubCabinetSolution/Views/EditUserDialog.xaml index 7758cbc..6072683 100644 --- a/SubCabinetSolution/Views/EditUserDialog.xaml +++ b/SubCabinetSolution/Views/EditUserDialog.xaml @@ -25,7 +25,7 @@ + SelectedIndex="0"> diff --git a/SubCabinetSolution/obj/Debug/App.g.i.cs b/SubCabinetSolution/obj/Debug/App.g.i.cs index ee139c2..28aa4af 100644 --- a/SubCabinetSolution/obj/Debug/App.g.i.cs +++ b/SubCabinetSolution/obj/Debug/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "27580469B4D987AA0CB33DD50B8674AE0E12358D57545093F54A0D9ABD1D6C60" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "0DB0F853C384B16C45D114AD6CBA61561846A5984F68DC95FA25A45EF807B52D" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -55,7 +55,7 @@ _contentLoaded = true; #line 9 "..\..\App.xaml" - this.StartupUri = new System.Uri("/Views/MainWindow.xaml", System.UriKind.Relative); + this.StartupUri = new System.Uri("/Views/CabinetWindow.xaml", System.UriKind.Relative); #line default #line hidden